Skip to content

Commit

Permalink
Use jemalloc-local instead of jemalloc (#221)
Browse files Browse the repository at this point in the history
* Use jemalloc-local instead of jemalloc

Fixes #220

* trying to add environment variable

* [skip ci] no build on push

* PCH

---------

Co-authored-by: Marc-Antoine Schmidt <[email protected]>
  • Loading branch information
xhochy and MarcAntoineSchmidtQC authored Feb 7, 2023
1 parent 0bf1214 commit c1a427e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Build and upload to PyPI

on:
push:
pull_request:
release:
types:
Expand Down
2 changes: 1 addition & 1 deletion build_tools/prepare_macos_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ else
CONDA_CHANNEL="conda-forge/osx-64"
fi

conda create -n build -c $CONDA_CHANNEL jemalloc xsimd llvm-openmp
conda create -n build -c $CONDA_CHANNEL jemalloc-local xsimd llvm-openmp
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ LDFLAGS="-Wl,-rpath,$CONDA/envs/build/lib -L$CONDA/envs/build/lib -lomp"
CFLAGS="-I$CONDA/envs/build/include"
CXX="/usr/bin/clang++"
CC="/usr/bin/clang"
JE_INSTALL_SUFFIX="local"

[tool.cibuildwheel.windows]
before-all = [
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@
include_dirs.append(os.path.join(sys.prefix, "Library", "include"))
elif sys.platform == "darwin":
jemalloc_config = shutil.which("jemalloc-config")
if jemalloc_config is None:
if "JE_INSTALL_SUFFIX" in os.environ:
je_install_suffix = os.environ["JE_INSTALL_SUFFIX"]
elif jemalloc_config is None:
je_install_suffix = ""
else:
pkg_info = (
Expand Down

0 comments on commit c1a427e

Please sign in to comment.