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`: 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" 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 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a66fd80..fa621d3 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 @@ -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) }}