Skip to content

Commit

Permalink
Merge pull request #18 from chroma-core/hammad/revert
Browse files Browse the repository at this point in the history
Revert to before setup.py
  • Loading branch information
HammadB authored Jul 22, 2024
2 parents 87d2d16 + c6f90ba commit 9e5408a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,19 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.12'
python-version: '3.10'
- name: Install cibuildwheel
run: python -m pip install cibuildwheel==2.19.1
- name: Build wheels
run: python -m cibuildwheel --output-dir dist
env:
CIBW_ENVIRONMENT: HNSWLIB_NO_NATIVE=true
CIBW_ENVIRONMENT_PASS_LINUX: HNSWLIB_NO_NATIVE
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.7"
CIBW_SKIP: "pp* *musllinux*"
CIBW_ARCHS_MACOS: "x86_64 arm64"
CIBW_ARCHS_WINDOWS: "AMD64"
CIBW_ARCHS_LINUX: "x86_64 aarch64"
CIBW_BUILD_VERBOSITY: "3"
CIBW_ENVIRONMENT: "CFLAGS='-v' CXXFLAGS='-v' LDFLAGS='-v' HNSWLIB_NO_NATIVE=true"
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install pybind11
run: python -m pip install --force-reinstall pybind11==2.11.1

- name: Build and install
run: python -m pip install .

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from setuptools import Extension, setup
from setuptools.command.build_ext import build_ext

__version__ = "0.7.6.alpha9"
__version__ = "0.7.6.alpha10"

include_dirs = [
pybind11.get_include(),
Expand Down Expand Up @@ -76,7 +76,7 @@ class BuildExt(build_ext):
"""A custom build extension for adding compiler-specific options."""

c_opts = {
"msvc": ["/EHsc", "/O2"],
"msvc": ["/EHsc", "/openmp", "/O2"],
#'unix': ['-O3', '-march=native'], # , '-w'
"unix": ["-O3"], # , '-w'
}
Expand Down

0 comments on commit 9e5408a

Please sign in to comment.