catboost: 1.2.5 -> 1.2.7
Diff: https://github.com/catboost/catboost/compare/v1.2.5...v1.2.7 Changelog: https://github.com/catboost/catboost/releases/tag/v1.2.7
This commit is contained in:
committed by
Gaétan Lepage
parent
5d2c1a9655
commit
8ff97cbeb1
@@ -23,13 +23,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "catboost";
|
||||
version = "1.2.5";
|
||||
version = "1.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catboost";
|
||||
repo = "catboost";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-2dfCCCa0LheytkLRbYuBd25M320f1kbhBWKIVjslor0=";
|
||||
hash = "sha256-I3geFdVQ1Pm61eRXi+ueaxel3QRb8EJV9f4zV2Q7kk4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -93,6 +93,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
);
|
||||
|
||||
env = {
|
||||
PROGRAM_VERSION = finalAttrs.version;
|
||||
|
||||
# catboost requires clang 14+ for build, but does clang 12 for cuda build.
|
||||
# after bumping the default version of llvm, check for compatibility with the cuda backend and pin it.
|
||||
# see https://catboost.ai/en/docs/installation/build-environment-setup-for-cmake#compilers,-linkers-and-related-tools
|
||||
@@ -128,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
library, used for ranking, classification, regression and other machine
|
||||
learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU.
|
||||
'';
|
||||
changelog = "https://github.com/catboost/catboost/releases/tag/v${finalAttrs.version}";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://catboost.ai";
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ed6c53b220..5c6fb8f157 100644
|
||||
index 24ffd1225a..700adcc246 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -29,7 +29,6 @@ include(cmake/global_flags.cmake)
|
||||
@@ -39,7 +39,6 @@ include(cmake/global_flags.cmake)
|
||||
include(cmake/global_vars.cmake)
|
||||
include(cmake/archive.cmake)
|
||||
include(cmake/common.cmake)
|
||||
-include(cmake/conan.cmake)
|
||||
-include(cmake/conan1_deprecated.cmake)
|
||||
include(cmake/cuda.cmake)
|
||||
include(cmake/cython.cmake)
|
||||
include(cmake/fbs.cmake)
|
||||
@@ -38,21 +37,6 @@ include(cmake/recursive_library.cmake)
|
||||
@@ -48,21 +47,6 @@ include(cmake/recursive_library.cmake)
|
||||
include(cmake/shared_libs.cmake)
|
||||
include(cmake/swig.cmake)
|
||||
|
||||
@@ -24,11 +24,16 @@ index ed6c53b220..5c6fb8f157 100644
|
||||
- BUILD missing
|
||||
- REMOTE conancenter
|
||||
- SETTINGS ${settings}
|
||||
- ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}"
|
||||
- CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}"
|
||||
- ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}"
|
||||
- CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}"
|
||||
- )
|
||||
-endif()
|
||||
-
|
||||
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
|
||||
include(CMakeLists.linux-x86_64.txt)
|
||||
elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND HAVE_CUDA)
|
||||
@@ -93,4 +77,3 @@ elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86")
|
||||
elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86_64")
|
||||
include(CMakeLists.android-x86_64.txt)
|
||||
endif()
|
||||
-
|
||||
|
||||
Reference in New Issue
Block a user