From f24d0cfe61c556c8b280e3cff7f05887110bde38 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 00:56:45 +0000 Subject: [PATCH 01/11] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 800ba85..a390d04 100644 --- a/README.md +++ b/README.md @@ -222,3 +222,6 @@ Feedstock Maintainers * [@jeongseok-meta](https://github.com/jeongseok-meta/) + + + From 7f81974f9400746d798cb3340a1890128e62295d Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 00:59:35 +0000 Subject: [PATCH 02/11] ENH: updated version to 0.1.26 & Re-rendered with conda-build 24.11.2, conda-smithy 3.45.2, and conda-forge-pinning 2025.01.15.19.32.56 --- .ci_support/win_64_cuda_compiler_versionNone.yaml | 15 --------------- README.md | 3 --- recipe/meta.yaml | 4 ++-- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 310184e..8560539 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -16,24 +16,9 @@ fmt: - '11' libboost_devel: - '1.84' -numpy: -- '2.0' -- '2.0' -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython re2: - 2024.07.02 spdlog: - '1.14' target_platform: - win-64 -zip_keys: -- - python - - numpy diff --git a/README.md b/README.md index a390d04..800ba85 100644 --- a/README.md +++ b/README.md @@ -222,6 +222,3 @@ Feedstock Maintainers * [@jeongseok-meta](https://github.com/jeongseok-meta/) - - - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a66fd80..1bbb29a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set pymomentum_cpu_gpu = "pymomentum-gpu" %} # [cuda_compiler_version != "None"] {% set pymomentum_cpu_gpu = "pymomentum-cpu" %} # [cuda_compiler_version == "None"] {% set name = "momentum" %} -{% set version = "0.1.24" %} +{% set version = "0.1.26" %} package: name: {{ name|lower }} @@ -9,7 +9,7 @@ package: source: - url: https://github.com/facebookincubator/momentum/archive/v{{ version }}.tar.gz - sha256: 6f7094cb62cda91eb9d95e0542bbbfcf2f03a01b5ab97cb942d4ee883485bea5 + sha256: a447f4d6958be3078bb15110f1dcfb34355c06c9e9a80167a1e18e287cd07eb8 patches: - 002-remove-pyproject-toml.patch - 003-add-setup-py.patch From 9c98d33785a4517e53f19fa5aa07b2bf23dd6776 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Wed, 15 Jan 2025 17:21:35 -0800 Subject: [PATCH 03/11] Update patch --- recipe/002-remove-pyproject-toml.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/002-remove-pyproject-toml.patch b/recipe/002-remove-pyproject-toml.patch index 9ed2ba9..ee20efa 100644 --- a/recipe/002-remove-pyproject-toml.patch +++ b/recipe/002-remove-pyproject-toml.patch @@ -3,7 +3,7 @@ deleted file mode 100644 index 588d032..0000000 --- a/pyproject.toml +++ /dev/null -@@ -1,55 +0,0 @@ +@@ -1,54 +0,0 @@ -[build-system] -requires = ["scikit-build-core", "pybind11"] -build-backend = "scikit_build_core.build" @@ -45,7 +45,6 @@ index 588d032..0000000 - "CMakeLists.txt", -] -wheel.exclude = ["geometry_test_helper.*"] --wheel.py-api = "cp310" - -[[tool.scikit-build.overrides]] -if.platform-system = "^win32" From 1495d55dcca3d18249c02b596e75560fe8145f04 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Wed, 15 Jan 2025 17:59:14 -0800 Subject: [PATCH 04/11] Suppress build error: 2025-01-16T01:32:19.1846462Z /home/conda/feedstock_root/build_artifacts/momentum_1736990869126/_build_env/lib/gcc/powerpc64le-conda-linux-gnu/13.3.0/include/mmintrin.h:52:2: error: #error "Please read comment above. Use -DNO_WARN_X86_INTRINSICS to disable this error." 2025-01-16T01:32:19.1846853Z 52 | #error "Please read comment above. Use -DNO_WARN_X86_INTRINSICS to disable this error." 2025-01-16T01:32:19.1847087Z | ^~~~~ --- recipe/build_cpp.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/build_cpp.sh b/recipe/build_cpp.sh index bde705e..dad79b3 100755 --- a/recipe/build_cpp.sh +++ b/recipe/build_cpp.sh @@ -18,6 +18,10 @@ if [[ "${target_platform}" == *aarch64 || "${target_platform}" == *ppc64le ]]; t CXXFLAGS="${CXXFLAGS} -Wno-narrowing" fi +if [[ "${target_platform}" == *ppc64le ]]; then + CXXFLAGS="${CXXFLAGS} -DNO_WARN_X86_INTRINSICS" +fi + # Disable use of system-installed GTest libraries when cross-compiling if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" ]]; then MOMENTUM_USE_SYSTEM_GOOGLETEST=ON From 0909ea842d37bf9268f34a68f30c5483f366eb9e Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Wed, 15 Jan 2025 18:44:00 -0800 Subject: [PATCH 05/11] Add nvtx-c --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1bbb29a..678f540 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -144,6 +144,7 @@ outputs: - libcusparse-dev - magma - nccl + - nvtx-c {% endif %} # other requirements - ceres-solver From c878fb93008a11759966394bbe14022373660470 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Wed, 15 Jan 2025 18:52:48 -0800 Subject: [PATCH 06/11] nvtx-c is not available on osx_arm64 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 678f540..4782886 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -144,7 +144,7 @@ outputs: - libcusparse-dev - magma - nccl - - nvtx-c + - nvtx-c # [linux and win] {% endif %} # other requirements - ceres-solver From 50523030b85062a5c48a52217d6c42f05207881c Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Wed, 15 Jan 2025 19:25:46 -0800 Subject: [PATCH 07/11] nvtx-c for linux and win --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4782886..827362f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -144,7 +144,7 @@ outputs: - libcusparse-dev - magma - nccl - - nvtx-c # [linux and win] + - nvtx-c # [linux or win] {% endif %} # other requirements - ceres-solver From 33ce154140f83e5270f4e76868ed7828639e40f7 Mon Sep 17 00:00:00 2001 From: "Jeongseok (JS) Lee" <142548112+jeongseok-meta@users.noreply.github.com> Date: Thu, 16 Jan 2025 09:42:59 -0800 Subject: [PATCH 08/11] Add cuda-toolkit --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 827362f..476443b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -136,6 +136,7 @@ outputs: - cuda-nvtx-dev - cuda-nvml-dev - cuda-profiler-api + - cuda-toolkit - cudnn - libcublas-dev - libcufft-dev From 8561b64a7656f9fff1a91e6290152d016cb8786a Mon Sep 17 00:00:00 2001 From: "Jeongseok (JS) Lee" <142548112+jeongseok-meta@users.noreply.github.com> Date: Thu, 16 Jan 2025 10:05:28 -0800 Subject: [PATCH 09/11] Disable linux-64 + CUDA for now --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 476443b..3d7f392 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -99,6 +99,7 @@ outputs: skip: true # [win] skip: true # [ppc64le] skip: true # [aarch64 and cuda_compiler_version != "None"] + skip: true # [linux-64 and cuda_compiler_version != "None"] requirements: build: - {{ compiler('cxx') }} @@ -136,7 +137,6 @@ outputs: - cuda-nvtx-dev - cuda-nvml-dev - cuda-profiler-api - - cuda-toolkit - cudnn - libcublas-dev - libcufft-dev @@ -145,7 +145,6 @@ outputs: - libcusparse-dev - magma - nccl - - nvtx-c # [linux or win] {% endif %} # other requirements - ceres-solver From 8d9c946ac35f49caa540ffbb3ba23ffcc3b6d8d2 Mon Sep 17 00:00:00 2001 From: "Jeongseok (JS) Lee" <142548112+jeongseok-meta@users.noreply.github.com> Date: Thu, 16 Jan 2025 10:24:23 -0800 Subject: [PATCH 10/11] Fix building pymomentum-gpu --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3d7f392..fa621d3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -200,6 +200,7 @@ outputs: skip: true # [win] skip: true # [ppc64le] skip: true # [aarch64 and cuda_compiler_version != "None"] + skip: true # [linux-64 and cuda_compiler_version != "None"] requirements: run: - {{ pin_subpackage("pymomentum", exact=True) }} From aacfaf7b5e3729a18c932b1bb8f6e5f70481ccfd Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 18:48:29 +0000 Subject: [PATCH 11/11] MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.2, and conda-forge-pinning 2025.01.16.17.10.46 --- .ci_support/win_64_cuda_compiler_versionNone.yaml | 15 +++++++++++++++ README.md | 7 +++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 8560539..310184e 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -16,9 +16,24 @@ fmt: - '11' libboost_devel: - '1.84' +numpy: +- '2.0' +- '2.0' +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.12.* *_cpython re2: - 2024.07.02 spdlog: - '1.14' target_platform: - win-64 +zip_keys: +- - python + - numpy diff --git a/README.md b/README.md index 800ba85..ed7e08d 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,6 @@ Current release info | [![Conda Recipe](https://img.shields.io/badge/recipe-momentum--cpp-green.svg)](https://anaconda.org/conda-forge/momentum-cpp) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/momentum-cpp.svg)](https://anaconda.org/conda-forge/momentum-cpp) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/momentum-cpp.svg)](https://anaconda.org/conda-forge/momentum-cpp) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/momentum-cpp.svg)](https://anaconda.org/conda-forge/momentum-cpp) | | [![Conda Recipe](https://img.shields.io/badge/recipe-pymomentum-green.svg)](https://anaconda.org/conda-forge/pymomentum) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/pymomentum.svg)](https://anaconda.org/conda-forge/pymomentum) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/pymomentum.svg)](https://anaconda.org/conda-forge/pymomentum) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/pymomentum.svg)](https://anaconda.org/conda-forge/pymomentum) | | [![Conda Recipe](https://img.shields.io/badge/recipe-pymomentum--cpu-green.svg)](https://anaconda.org/conda-forge/pymomentum-cpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/pymomentum-cpu.svg)](https://anaconda.org/conda-forge/pymomentum-cpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/pymomentum-cpu.svg)](https://anaconda.org/conda-forge/pymomentum-cpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/pymomentum-cpu.svg)](https://anaconda.org/conda-forge/pymomentum-cpu) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-pymomentum--gpu-green.svg)](https://anaconda.org/conda-forge/pymomentum-gpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/pymomentum-gpu.svg)](https://anaconda.org/conda-forge/pymomentum-gpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/pymomentum-gpu.svg)](https://anaconda.org/conda-forge/pymomentum-gpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/pymomentum-gpu.svg)](https://anaconda.org/conda-forge/pymomentum-gpu) | Installing momentum =================== @@ -116,16 +115,16 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `momentum, momentum-cpp, pymomentum, pymomentum-cpu, pymomentum-gpu` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `momentum, momentum-cpp, pymomentum, pymomentum-cpu` can be installed with `conda`: ``` -conda install momentum momentum-cpp pymomentum pymomentum-cpu pymomentum-gpu +conda install momentum momentum-cpp pymomentum pymomentum-cpu ``` or with `mamba`: ``` -mamba install momentum momentum-cpp pymomentum pymomentum-cpu pymomentum-gpu +mamba install momentum momentum-cpp pymomentum pymomentum-cpu ``` It is possible to list all of the versions of `momentum` available on your platform with `conda`: