[pypi] removed pybind11

diyabc · May 17, 2024 · b56de40 · b56de40
1 parent 174de32
commit b56de40
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -106,10 +106,12 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
       - name: setup MacOS
         run: |
-          brew install ninja gcc@14
-          echo "CC=gcc-14" >> $GITHUB_ENV
-          echo "CXX=g++-14" >> $GITHUB_ENV
-          echo "CXXFLAGS=-static-libstdc++ -static-libgcc" >> $GITHUB_ENV
+          brew install ninja
+          echo "CC=$(brew --prefix llvm@15)/bin/clang" >> $GITHUB_ENV
+          echo "CXX=$(brew --prefix llvm@15)/bin/clang++" >> $GITHUB_ENV
+          # echo "CC=gcc-14" >> $GITHUB_ENV
+          # echo "CXX=g++-14" >> $GITHUB_ENV
+          # echo "CXXFLAGS=-static-libstdc++ -static-libgcc" >> $GITHUB_ENV
         if: matrix.os == 'macos-latest'
       - name: Configure MSVC console (Windows)
         if: matrix.os == 'windows-latest'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -76,7 +76,7 @@ if(TEST)
 endif()
 
 if(PYABCRANGER)
-  find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
+  # find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
   set(PYBIND11PKG pybind11)
 endif()
 
@@ -85,10 +85,6 @@ set(VCPKG_REVISION $ENV{VCPKG_REVISION})
 
 pmm(
     VCPKG
-        # https://github.com/microsoft/vcpkg/pull/19665
-        # REVISION a69b65229b3956b7f45abd81671b7330114bcaad
-        # REVISION 6f7ffeb18f99796233b958aaaf14ec7bd4fb64b2
-        # REVISION 9d47b24eacbd1cd94f139457ef6cd35e5d92cc84
         REVISION ${VCPKG_REVISION}
         TRIPLET ${VCPKG_TARGET_TRIPLET}
         REQUIRES range-v3 catch2 cxxopts fmt  eigen3 ${PYBIND11PKG} ${TBBPKG} ${BOOSTREPKG} ${TESTDEPS}

diff --git a/setup.py b/setup.py
@@ -14,9 +14,9 @@
 elif sys.platform == "linux":
     configure_opts = ["-DPython_EXECUTABLE="+sys.executable,"-DPYABCRANGER=TRUE","-DUSE_MKL:BOOL=TRUE","-DMAKE_STATIC_EXE:BOOL=TRUE","-DLAPACK_ROOT:STRING=/opt/intel/oneapi/mkl/latest/lib","-DLAPACK_LIBRARIES:STRING=-Wl,--start-group /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_intel_lp64.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_tbb_thread.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_core.a -Wl,--end-group;pthread;m;dl","-DBLAS_LIBRARIES:STRING=-Wl,--start-group /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_intel_lp64.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_tbb_thread.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_core.a -Wl,--end-group;pthread;m;dl"]
 elif sys.platform == "darwin":
-    configure_opts = ["-DPython_EXECUTABLE="+sys.executable,"-DPYABCRANGER=TRUE","-DUSE_MKL:BOOL=FALSE","-DCMAKE_BUILD_TYPE:STRING=Release"]
+    configure_opts = ["-DPython_EXECUTABLE="+sys.executable,"-DCMAKE_OSX_ARCHITECTURES:STRING=arm64","-DPYABCRANGER=TRUE","-DUSE_MKL:BOOL=FALSE","-DCMAKE_BUILD_TYPE:STRING=Release"]
 elif sys.platform == "win32":
-    configure_opts = ["-DPython_FIND_REGISTRY=NEVER","-DPYABCRANGER=TRUE","-DCMAKE_OSX_ARCHITECTURES:STRING=arm64","-DUSE_MKL:BOOL=FALSE","-DMAKE_STATIC_EXE:BOOL=TRUE","-DVCPKG_TARGET_TRIPLET:STRING=x64-windows-static"]
+    configure_opts = ["-DPython_FIND_REGISTRY=NEVER","-DPYABCRANGER=TRUE",,"-DUSE_MKL:BOOL=FALSE","-DMAKE_STATIC_EXE:BOOL=TRUE","-DVCPKG_TARGET_TRIPLET:STRING=x64-windows-static"]
 else:
     exit(1)