Skip to content

Commit

Permalink
Fix xsimd issue with ppc64le (#335)
Browse files Browse the repository at this point in the history
* limit xsimd version

* escape

* add flag

* fix flag

* make xsimd pin less restrictive

* is that how dependencies are specified?

* oops. OR not AND
  • Loading branch information
MarcAntoineSchmidtQC authored Dec 12, 2023
1 parent 821608e commit 32e43a3
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build_tools/prepare_macos_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ requirements:
- numpy
- pip
- setuptools_scm
- xsimd
- xsimd <11|>12.1
run:
- python
- {{ pin_compatible('numpy') }}
Expand Down
2 changes: 1 addition & 1 deletion environment-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies:
- make
- mako
- mkl-include
- xsimd
- xsimd <11|>12.1

# documentation dev
- jupyterlab
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
- jemalloc-local
- make
- mako
- xsimd
- xsimd <11|>12.1

# documentation dev
- jupyterlab
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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++"
Expand All @@ -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]
Expand All @@ -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",
Expand Down

0 comments on commit 32e43a3

Please sign in to comment.