Merge pull request #102 from conda-forge-admin/conda_forge_admin_101

momentum v0.1.26
conda-forge · Jan 17, 2025 · 5ee753f · 5ee753f
2 parents 2dd73e3 + aacfaf7
commit 5ee753f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/README.md b/README.md
diff --git 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"

diff --git 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

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,15 +1,15 @@
 {% 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 }}
   version: {{ version }}
 
 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
@@ -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') }}
@@ -199,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) }}