From ce258219bb8fef47bce373742cfb55cb25ed31d8 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Schmidt Date: Mon, 11 Dec 2023 13:57:41 -0500 Subject: [PATCH 1/7] limit xsimd version --- conda.recipe/meta.yaml | 2 +- environment-win.yml | 2 +- environment.yml | 2 +- pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index b2a77971..e22859bc 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -32,7 +32,7 @@ requirements: - numpy - pip - setuptools_scm - - xsimd + - xsimd <11 run: - python - {{ pin_compatible('numpy') }} diff --git a/environment-win.yml b/environment-win.yml index 0fd73327..a49f0e11 100644 --- a/environment-win.yml +++ b/environment-win.yml @@ -23,7 +23,7 @@ dependencies: - make - mako - mkl-include - - xsimd + - xsimd <11 # documentation dev - jupyterlab diff --git a/environment.yml b/environment.yml index 28d45ac8..1c7ac322 100644 --- a/environment.yml +++ b/environment.yml @@ -22,7 +22,7 @@ dependencies: - jemalloc-local - make - mako - - xsimd + - xsimd <11 # documentation dev - jupyterlab diff --git a/pyproject.toml b/pyproject.toml index 48e72167..f86e7958 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ JE_INSTALL_SUFFIX="local" [tool.cibuildwheel.windows] before-all = [ - "C:\\Miniconda\\condabin\\conda install -c conda-forge xsimd", + "C:\\Miniconda\\condabin\\conda install -c conda-forge 'xsimd<11'", ] [tool.cibuildwheel.windows.environment] From 931d84bb4742314ff52db95c8fc081c3a7c8f89a Mon Sep 17 00:00:00 2001 From: Marc-Antoine Schmidt Date: Mon, 11 Dec 2023 14:04:31 -0500 Subject: [PATCH 2/7] escape --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f86e7958..7ff1ca07 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ JE_INSTALL_SUFFIX="local" [tool.cibuildwheel.windows] before-all = [ - "C:\\Miniconda\\condabin\\conda install -c conda-forge 'xsimd<11'", + "C:\\Miniconda\\condabin\\conda install -c conda-forge \"xsimd<11\"", ] [tool.cibuildwheel.windows.environment] From e7b9058da262a3f5042c19b254ebaf471673d6e6 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Schmidt Date: Tue, 12 Dec 2023 11:01:29 -0500 Subject: [PATCH 3/7] add flag --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7ff1ca07..15450e41 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,7 +51,7 @@ before-build = [ ] [tool.cibuildwheel.macos.environment] -LDFLAGS="-Wl,-rpath,$CONDA/envs/build/lib -L$CONDA/envs/build/lib" +LDFLAGS="-Wl,-rpath,$CONDA/envs/build/lib -L$CONDA/envs/build/lib,-headerpad_max_install_names" CFLAGS="-I$CONDA/envs/build/include" CXXFLAGS="-I$CONDA/envs/build/include" CXX="/usr/bin/clang++" From fda8efd9e89c97e63373ca15bc7d3d1a42224ee9 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Schmidt Date: Tue, 12 Dec 2023 11:05:54 -0500 Subject: [PATCH 4/7] fix flag --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 15450e41..33482105 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,7 +51,7 @@ before-build = [ ] [tool.cibuildwheel.macos.environment] -LDFLAGS="-Wl,-rpath,$CONDA/envs/build/lib -L$CONDA/envs/build/lib,-headerpad_max_install_names" +LDFLAGS="-Wl,-rpath,$CONDA/envs/build/lib -L$CONDA/envs/build/lib -headerpad_max_install_names" CFLAGS="-I$CONDA/envs/build/include" CXXFLAGS="-I$CONDA/envs/build/include" CXX="/usr/bin/clang++" From f7b632189489948d761af2b2b1e68b4d821a4d59 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Schmidt Date: Tue, 12 Dec 2023 12:33:26 -0500 Subject: [PATCH 5/7] make xsimd pin less restrictive --- build_tools/prepare_macos_wheel.sh | 2 +- environment-win.yml | 2 +- environment.yml | 2 +- pyproject.toml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build_tools/prepare_macos_wheel.sh b/build_tools/prepare_macos_wheel.sh index 3a7949b4..a1ed6c8b 100644 --- a/build_tools/prepare_macos_wheel.sh +++ b/build_tools/prepare_macos_wheel.sh @@ -8,4 +8,4 @@ else export CONDA_SUBDIR="osx-64" fi -/Users/runner/micromamba-bin/micromamba create -y -p $CONDA/envs/build -c conda-forge jemalloc-local xsimd llvm-openmp +/Users/runner/micromamba-bin/micromamba create -y -p $CONDA/envs/build -c conda-forge jemalloc-local "xsimd<11,>12.1" llvm-openmp diff --git a/environment-win.yml b/environment-win.yml index a49f0e11..7ade72dd 100644 --- a/environment-win.yml +++ b/environment-win.yml @@ -23,7 +23,7 @@ dependencies: - make - mako - mkl-include - - xsimd <11 + - xsimd <11, >12.1 # documentation dev - jupyterlab diff --git a/environment.yml b/environment.yml index 1c7ac322..5450ffed 100644 --- a/environment.yml +++ b/environment.yml @@ -22,7 +22,7 @@ dependencies: - jemalloc-local - make - mako - - xsimd <11 + - xsimd <11, >12.1 # documentation dev - jupyterlab diff --git a/pyproject.toml b/pyproject.toml index 33482105..2927cdf7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -69,13 +69,13 @@ INCLUDE="C:\\\\Miniconda\\\\Library\\\\include" [tool.cibuildwheel.linux] before-all = [ "cd ~/", - "git clone --branch 5.2.1 https://github.com/jemalloc/jemalloc.git", + "git clone --branch 5.3.0 https://github.com/jemalloc/jemalloc.git", "cd jemalloc", "./autogen.sh --disable-cxx --with-jemalloc-prefix=local --with-install-suffix=local --disable-tls --disable-initial-exec-tls", "make", "make install_bin install_include install_lib", "cd ~/", - "git clone --branch 7.6.0 https://github.com/xtensor-stack/xsimd.git", + "git clone --branch 12.1.1 https://github.com/xtensor-stack/xsimd.git", "cd xsimd", "mkdir build", "cd build", From 5956e6d8697f2340f9a5189de911db075599d716 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Schmidt Date: Tue, 12 Dec 2023 12:36:49 -0500 Subject: [PATCH 6/7] is that how dependencies are specified? --- environment-win.yml | 2 +- environment.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment-win.yml b/environment-win.yml index 7ade72dd..05105f71 100644 --- a/environment-win.yml +++ b/environment-win.yml @@ -23,7 +23,7 @@ dependencies: - make - mako - mkl-include - - xsimd <11, >12.1 + - xsimd <11,>12.1 # documentation dev - jupyterlab diff --git a/environment.yml b/environment.yml index 5450ffed..ae8ccbdb 100644 --- a/environment.yml +++ b/environment.yml @@ -22,7 +22,7 @@ dependencies: - jemalloc-local - make - mako - - xsimd <11, >12.1 + - xsimd <11,>12.1 # documentation dev - jupyterlab From 1ff3ab056c3c1502c363c9c9844ae737d5639ef2 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Schmidt Date: Tue, 12 Dec 2023 12:51:04 -0500 Subject: [PATCH 7/7] oops. OR not AND --- build_tools/prepare_macos_wheel.sh | 2 +- conda.recipe/meta.yaml | 2 +- environment-win.yml | 2 +- environment.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build_tools/prepare_macos_wheel.sh b/build_tools/prepare_macos_wheel.sh index a1ed6c8b..9b3fab1a 100644 --- a/build_tools/prepare_macos_wheel.sh +++ b/build_tools/prepare_macos_wheel.sh @@ -8,4 +8,4 @@ else export CONDA_SUBDIR="osx-64" fi -/Users/runner/micromamba-bin/micromamba create -y -p $CONDA/envs/build -c conda-forge jemalloc-local "xsimd<11,>12.1" llvm-openmp +/Users/runner/micromamba-bin/micromamba create -y -p $CONDA/envs/build -c conda-forge jemalloc-local "xsimd<11|>12.1" llvm-openmp diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index e22859bc..8a3d8a1c 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -32,7 +32,7 @@ requirements: - numpy - pip - setuptools_scm - - xsimd <11 + - xsimd <11|>12.1 run: - python - {{ pin_compatible('numpy') }} diff --git a/environment-win.yml b/environment-win.yml index 05105f71..e60e4151 100644 --- a/environment-win.yml +++ b/environment-win.yml @@ -23,7 +23,7 @@ dependencies: - make - mako - mkl-include - - xsimd <11,>12.1 + - xsimd <11|>12.1 # documentation dev - jupyterlab diff --git a/environment.yml b/environment.yml index ae8ccbdb..8ac5c887 100644 --- a/environment.yml +++ b/environment.yml @@ -22,7 +22,7 @@ dependencies: - jemalloc-local - make - mako - - xsimd <11,>12.1 + - xsimd <11|>12.1 # documentation dev - jupyterlab