Merge pull request #20 from sameeul/win2022

Win2022
conda-forge · Jun 13, 2023 · 69e1166 · 69e1166
2 parents a4da4fa + a7a37f3
commit 69e1166
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 7 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/recipe/0000-win_2022.patch b/recipe/0000-win_2022.patch
@@ -0,0 +1,23 @@
+diff --git a/setup.py b/setup.py
+index 4cb904b..2a9d48a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -56,12 +56,12 @@ class CMakeBuild(build_ext):
+
+         if platform.system() == "Windows":
+             print("-----------------Windows...")
+-            cmake_args += [
+-                "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}".format(cfg.upper(), extdir)
+-            ]
+-            if sys.maxsize > 2 ** 32:
+-                cmake_args += ["-A", "x64"]
+-            build_args += ["--", "/m"]
++            # cmake_args += [
++            #     "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}".format(cfg.upper(), extdir)
++            # ]
++            # if sys.maxsize > 2 ** 32:
++            #     cmake_args += ["-A", "x64"]
++            # build_args += ["--", "/m"]
+         else:
+             cmake_args += ["-DCMAKE_BUILD_TYPE=" + cfg]
+             build_args += ["--", "-j2"]
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -1,3 +1,5 @@
-set CMAKE_GENERATOR=Visual Studio 16 2019
-set CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX " 
-python -m pip install .
+set CMAKE_GENERATOR_PLATFORM=
+set CMAKE_GENERATOR_TOOLSET=
+set CMAKE_GENERATOR=Ninja
+set CMAKE_ARGS=-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX
+python -m pip install . -vv
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -9,4 +9,4 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 	export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
 fi
 
-CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX" python -m pip install .
+CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX" python -m pip install . -vv
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -8,9 +8,10 @@ package:
 source:
   url: https://github.com/PolusAI/{{ name }}/archive/refs/tags/{{ version }}.tar.gz
   sha256: e89c37bfe8c32d060c9eaa36aebf5ccc3d4bff8afee6b26176fe04a279f45748
-
+  patches:
+    - 0000-win_2022.patch
 build:
-  number: 3
+  number: 4
   skip: true  # [py<36]
   missing_dso_whitelist:
     - '*/nvcuda.dll'   # [win]
@@ -26,6 +27,7 @@ requirements:
     - {{ compiler('cxx') }}
     - {{ compiler('cuda') }}  # [cuda_compiler_version != "None"]
     - git
+    - ninja  # [win]    
 
   host:
     - python