Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pre-commit autoupdate #331

Merged
merged 2 commits into from
Dec 12, 2023
Merged

Pre-commit autoupdate #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3b76d1
Pre-commit autoupdate
quant-ranger[bot] Dec 4, 2023
e210a5e
Fix xsimd issue with ppc64le (#335)
MarcAntoineSchmidtQC Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
repos:
- repo: https://github.com/Quantco/pre-commit-mirrors-ruff
rev: 0.1.3
rev: 0.1.6
hooks:
- id: ruff-conda
- id: ruff-format-conda
- repo: https://github.com/Quantco/pre-commit-mirrors-mypy
rev: "1.6.1"
rev: "1.7.1"
hooks:
- id: mypy-conda
- repo: https://github.com/Quantco/pre-commit-mirrors-cython-lint
rev: 0.15.0
rev: 0.16.0
hooks:
- id: cython-lint-conda
args: [--no-pycodestyle]
Expand Down
2 changes: 1 addition & 1 deletion build_tools/prepare_macos_wheel.sh
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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