-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Update Conan profiles * Update build config to be in line with hictk's recipe * Update patch files * Update build script * Bump version * Update about section * Update requirements * Update test requirements * Update package version pinning * Make tests verbose * Enable parallel builds * Ensure the correct sysroot is used when building on macOS * Ensure the correct sysroot is used when building on Linux * Help CMake find NumPy headers * Export env variables in build script * Update checksum
- Loading branch information
Showing
9 changed files
with
165 additions
and
94 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
recipes/hictkpy/conan_profiles/gcc → recipes/hictkpy/conan_profiles/clang
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
[settings] | ||
arch=x86_64 | ||
build_type=Release | ||
compiler=gcc | ||
compiler=clang | ||
compiler.cppstd=17 | ||
compiler.libcxx=libstdc++11 | ||
compiler.version=13 | ||
compiler.version=18 | ||
os=Linux |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
diff --git a/conanfile.py b/conanfile.py | ||
index a7d5c74..c08b356 100644 | ||
--- a/conanfile.py | ||
+++ b/conanfile.py | ||
@@ -35,21 +35,11 @@ class HictkpyConan(ConanFile): | ||
return 17 | ||
|
||
def requirements(self): | ||
- self.requires("arrow/17.0.0#81be2aa6c49800df8cc163adf4b99e9f") | ||
- self.requires("boost/1.86.0#cd839a2082585255010f9e82eea94c7f", force=True) | ||
self.requires("bshoshany-thread-pool/4.1.0#be1802a8768416a6c9b1393cf0ce5e9c") | ||
self.requires("concurrentqueue/1.0.4#1e48e1c712bcfd892087c9c622a51502") | ||
- self.requires("eigen/3.4.0#2e192482a8acff96fe34766adca2b24c") | ||
- self.requires("fast_float/6.1.5#e067b96a6271d1b4c255858ca9805bdd") | ||
- self.requires("fmt/11.0.2#5c7438ef4d5d69ab106a41e460ce11f3", force=True) | ||
- self.requires("hdf5/1.14.4.3#df1467d7374938c231edbe10e83f2bb4", force=True) | ||
- self.requires("highfive/2.10.0#3d1bd25944a57fa1bc30a0a22923d528") | ||
- self.requires("libdeflate/1.22#f95aebe763153ccbc4cc76c023e42e5a") | ||
self.requires("parallel-hashmap/1.4.0#36ac84df77219748440cdb0f23624d56") | ||
self.requires("readerwriterqueue/1.0.6#aaa5ff6fac60c2aee591e9e51b063b83") | ||
self.requires("span-lite/0.11.0#519fd49fff711674cfed8cd17d4ed422") | ||
- self.requires("spdlog/1.14.1#972bbf70be1da4bc57ea589af0efde03") | ||
- self.requires("zstd/1.5.6#afefe79a309bc2a7b9f56c2093504c8b", force=True) | ||
|
||
def validate(self): | ||
if self.settings.get_safe("compiler.cppstd"): | ||
@@ -58,63 +48,3 @@ class HictkpyConan(ConanFile): | ||
def configure(self): | ||
if self.settings.compiler in ["clang", "gcc"]: | ||
self.settings.compiler.libcxx = "libstdc++11" | ||
- | ||
- self.options["arrow"].compute = True | ||
- self.options["arrow"].parquet = False | ||
- self.options["arrow"].with_boost = True | ||
- self.options["arrow"].with_re2 = True | ||
- self.options["arrow"].with_thrift = False | ||
- self.options["boost"].system_no_deprecated = True | ||
- self.options["boost"].asio_no_deprecated = True | ||
- self.options["boost"].filesystem_no_deprecated = True | ||
- self.options["boost"].filesystem_version = 4 | ||
- self.options["boost"].zlib = False | ||
- self.options["boost"].bzip2 = False | ||
- self.options["boost"].lzma = False | ||
- self.options["boost"].zstd = False | ||
- self.options["boost"].without_atomic = False | ||
- self.options["boost"].without_charconv = True | ||
- self.options["boost"].without_chrono = True | ||
- self.options["boost"].without_cobalt = True | ||
- self.options["boost"].without_container = True | ||
- self.options["boost"].without_context = True | ||
- self.options["boost"].without_contract = True | ||
- self.options["boost"].without_coroutine = True | ||
- self.options["boost"].without_date_time = True | ||
- self.options["boost"].without_exception = True | ||
- self.options["boost"].without_fiber = True | ||
- self.options["boost"].without_filesystem = False | ||
- self.options["boost"].without_graph = True | ||
- self.options["boost"].without_graph_parallel = True | ||
- self.options["boost"].without_iostreams = True | ||
- self.options["boost"].without_json = True | ||
- self.options["boost"].without_locale = True | ||
- self.options["boost"].without_log = True | ||
- self.options["boost"].without_math = True | ||
- self.options["boost"].without_mpi = True | ||
- self.options["boost"].without_nowide = True | ||
- self.options["boost"].without_process = False | ||
- self.options["boost"].without_program_options = True | ||
- self.options["boost"].without_python = True | ||
- self.options["boost"].without_random = True | ||
- self.options["boost"].without_regex = True | ||
- self.options["boost"].without_serialization = True | ||
- self.options["boost"].without_stacktrace = True | ||
- self.options["boost"].without_system = False | ||
- self.options["boost"].without_test = True | ||
- self.options["boost"].without_thread = True | ||
- self.options["boost"].without_timer = True | ||
- self.options["boost"].without_type_erasure = True | ||
- self.options["boost"].without_url = True | ||
- self.options["boost"].without_wave = True | ||
- self.options["fmt"].header_only = True | ||
- self.options["hdf5"].enable_cxx = False | ||
- self.options["hdf5"].hl = False | ||
- self.options["hdf5"].threadsafe = False | ||
- self.options["hdf5"].parallel = False | ||
- self.options["highfive"].with_boost = False | ||
- self.options["highfive"].with_eigen = False | ||
- self.options["highfive"].with_opencv = False | ||
- self.options["highfive"].with_xtensor = False | ||
- self.options["spdlog"].header_only = True | ||
- self.options["zstd"].build_programs = False |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
c_compiler: # [linux] | ||
- clang # [linux] | ||
c_compiler_version: # [linux] | ||
- 18 # [linux] | ||
cxx_compiler: # [linux] | ||
- clangxx # [linux] | ||
cxx_compiler_version: # [linux] | ||
- 18 # [linux] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
diff --git a/pyproject.toml b/pyproject.toml | ||
index 1a03623..36102d0 100644 | ||
index 5ded5b9..fe8d305 100644 | ||
--- a/pyproject.toml | ||
+++ b/pyproject.toml | ||
@@ -49,7 +49,7 @@ HICTK_BUILD_EXAMPLES = "OFF" | ||
HICTK_BUILD_BENCHMARKS = "OFF" | ||
HICTK_BUILD_TOOLS = "OFF" | ||
HICTK_ENABLE_GIT_VERSION_TRACKING = "OFF" | ||
@@ -74,7 +74,7 @@ wheel.expand-macos-universal-tags = true | ||
cmake.build-type = "Release" | ||
|
||
[tool.scikit-build.cmake.define] | ||
-BUILD_SHARED_LIBS = "OFF" | ||
+BUILD_SHARED_LIBS = "ON" | ||
CONAN_INSTALL_ARGS = "--settings=compiler.cppstd=17;--build=missing;--update;--options=*/*:shared=False" | ||
|
||
[tool.setuptools_scm] | ||
CMAKE_OSX_DEPLOYMENT_TARGET = "10.15" | ||
CMAKE_PROJECT_TOP_LEVEL_INCLUDES = { env="HICTKPY_PROJECT_TOP_LEVEL_INCLUDES", default="cmake/conan_provider.cmake" } | ||
CONAN_INSTALL_ARGS = { env="HICTKPY_CONAN_INSTALL_ARGS", default="--settings=compiler.cppstd=17;--settings=build_type=Release;--build=missing;--update;--options=*/*:shared=False" } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
#!/usr/bin/env bash | ||
|
||
"$PYTHON" -c 'import hictkpy; print(hictkpy.__version__)' | ||
"$PYTHON" -m pytest test | ||
"$PYTHON" -m pytest test -v |