From f7b632189489948d761af2b2b1e68b4d821a4d59 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Schmidt Date: Tue, 12 Dec 2023 12:33:26 -0500 Subject: [PATCH] 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",