From e8bc5d58d6f9c31d2abbd8db774d1c4c258a8981 Mon Sep 17 00:00:00 2001 From: hammadb Date: Mon, 22 Jul 2024 11:20:04 -0700 Subject: [PATCH 1/2] Revert to 408c5d1fa1dbc2acd8d1b4108191a8f803862210, keep version --- .github/workflows/release.yml | 5 ++--- .github/workflows/test.yml | 3 +-- setup.py | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ff948884..37c1136c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6c4b8b97..9674abb7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 . diff --git a/setup.py b/setup.py index 3610577a..ca6a7718 100644 --- a/setup.py +++ b/setup.py @@ -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.5" include_dirs = [ pybind11.get_include(), @@ -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' } From c6f90ba54a1f9688663f771d7a7d50a7cd438d0b Mon Sep 17 00:00:00 2001 From: hammadb Date: Mon, 22 Jul 2024 11:21:04 -0700 Subject: [PATCH 2/2] fix cersion --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ca6a7718..0c2bd424 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ from setuptools import Extension, setup from setuptools.command.build_ext import build_ext -__version__ = "0.7.5" +__version__ = "0.7.6.alpha10" include_dirs = [ pybind11.get_include(),