From ff5e576f975275a6767c17f2ea052126b97584ea Mon Sep 17 00:00:00 2001 From: sameeul Date: Fri, 9 Jun 2023 09:11:29 -0400 Subject: [PATCH 01/12] test win2022 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 488579a..76f2ebb 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_cuda_compilerNonecuda_compiler_versionNonenumpy1.21python3.10.____cpython: From cd3448dc2e3c113cfbc944052f5c821bd23f0724 Mon Sep 17 00:00:00 2001 From: sameeul Date: Fri, 9 Jun 2023 09:12:07 -0400 Subject: [PATCH 02/12] test win2022 --- recipe/bld.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index d3e4bc1..c7ea396 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,3 +1,3 @@ -set CMAKE_GENERATOR=Visual Studio 16 2019 +set CMAKE_GENERATOR=Visual Studio 17 2022 set CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX " -python -m pip install . \ No newline at end of file +python -m pip install . -vv \ No newline at end of file From a19c8b1583992153120e7bdc50756274930e00a8 Mon Sep 17 00:00:00 2001 From: sameeul Date: Fri, 9 Jun 2023 09:41:19 -0400 Subject: [PATCH 03/12] Try Ninja --- recipe/bld.bat | 2 +- recipe/meta.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index c7ea396..b93d10f 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,3 +1,3 @@ -set CMAKE_GENERATOR=Visual Studio 17 2022 +set CMAKE_GENERATOR=Ninja set CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX " python -m pip install . -vv \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5d16291..c83cc05 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,6 +26,7 @@ requirements: - {{ compiler('cxx') }} - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] - git + - ninja # [win] host: - python From f3861450393d9bdb564d178dd96e4698e50f022d Mon Sep 17 00:00:00 2001 From: sameeul Date: Fri, 9 Jun 2023 13:56:56 -0400 Subject: [PATCH 04/12] Try without generator --- recipe/bld.bat | 1 - recipe/meta.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index b93d10f..c4a2965 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,3 +1,2 @@ -set CMAKE_GENERATOR=Ninja set CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX " python -m pip install . -vv \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c83cc05..5d16291 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,7 +26,6 @@ requirements: - {{ compiler('cxx') }} - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] - git - - ninja # [win] host: - python From 628d2cbecc5fb17d716dce9d6975d720dd94444b Mon Sep 17 00:00:00 2001 From: Sameeul B Samee Date: Sat, 10 Jun 2023 05:57:08 -0400 Subject: [PATCH 05/12] Try ninja without -A --- recipe/bld.bat | 1 + recipe/meta.yaml | 4 +++- recipe/win_2022.patch | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 recipe/win_2022.patch diff --git a/recipe/bld.bat b/recipe/bld.bat index c4a2965..b93d10f 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,2 +1,3 @@ +set CMAKE_GENERATOR=Ninja set CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX " python -m pip install . -vv \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5d16291..ee163e3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,7 +8,8 @@ package: source: url: https://github.com/PolusAI/{{ name }}/archive/refs/tags/{{ version }}.tar.gz sha256: e89c37bfe8c32d060c9eaa36aebf5ccc3d4bff8afee6b26176fe04a279f45748 - + patches: + - win_2022.patch build: number: 3 skip: true # [py<36] @@ -26,6 +27,7 @@ requirements: - {{ compiler('cxx') }} - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] - git + - ninja # [win] host: - python diff --git a/recipe/win_2022.patch b/recipe/win_2022.patch new file mode 100644 index 0000000..491e836 --- /dev/null +++ b/recipe/win_2022.patch @@ -0,0 +1,15 @@ +diff --git a/setup.py b/setup.py +index 4cb904b..a3d991e 100644 +--- a/setup.py ++++ b/setup.py +@@ -59,8 +59,8 @@ class CMakeBuild(build_ext): + cmake_args += [ + "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}".format(cfg.upper(), extdir) + ] +- if sys.maxsize > 2 ** 32: +- cmake_args += ["-A", "x64"] ++ # if sys.maxsize > 2 ** 32: ++ # cmake_args += ["-A", "x64"] + build_args += ["--", "/m"] + else: + cmake_args += ["-DCMAKE_BUILD_TYPE=" + cfg] From 0d96987e6491a0a2f71829c83e86824438615597 Mon Sep 17 00:00:00 2001 From: Sameeul B Samee Date: Sat, 10 Jun 2023 06:02:06 -0400 Subject: [PATCH 06/12] fix lint --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ee163e3..491484f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,7 +27,7 @@ requirements: - {{ compiler('cxx') }} - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] - git - - ninja # [win] + - ninja # [win] host: - python From 38ad7e79992dea4093061f000c7117475d98e6f8 Mon Sep 17 00:00:00 2001 From: Sameeul B Samee Date: Sat, 10 Jun 2023 06:55:39 -0400 Subject: [PATCH 07/12] reset platform --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index b93d10f..f933972 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,3 +1,4 @@ +set CMAKE_GENERATOR_PLATFORM= set CMAKE_GENERATOR=Ninja set CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX " python -m pip install . -vv \ No newline at end of file From 2a8e176f96938fc1405a860f2ec573c80a452357 Mon Sep 17 00:00:00 2001 From: Sameeul B Samee Date: Sat, 10 Jun 2023 23:15:01 -0400 Subject: [PATCH 08/12] reset CMAKE_GENERATOR_TOOLSET --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index f933972..518ecc6 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,4 +1,5 @@ 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 \ No newline at end of file From e8136b18a48837d21cc06184c9411b0735474208 Mon Sep 17 00:00:00 2001 From: Sameeul B Samee Date: Sat, 10 Jun 2023 23:31:48 -0400 Subject: [PATCH 09/12] update patch --- recipe/win_2022.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/win_2022.patch b/recipe/win_2022.patch index 491e836..3a62a52 100644 --- a/recipe/win_2022.patch +++ b/recipe/win_2022.patch @@ -1,15 +1,17 @@ diff --git a/setup.py b/setup.py -index 4cb904b..a3d991e 100644 +index 4cb904b..bfb76ee 100644 --- a/setup.py +++ b/setup.py -@@ -59,8 +59,8 @@ class CMakeBuild(build_ext): +@@ -59,9 +59,9 @@ class CMakeBuild(build_ext): cmake_args += [ "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}".format(cfg.upper(), extdir) ] - if sys.maxsize > 2 ** 32: - cmake_args += ["-A", "x64"] +- build_args += ["--", "/m"] + # if sys.maxsize > 2 ** 32: + # cmake_args += ["-A", "x64"] - build_args += ["--", "/m"] ++ # build_args += ["--", "/m"] else: cmake_args += ["-DCMAKE_BUILD_TYPE=" + cfg] + build_args += ["--", "-j2"] From feb91ca30c4c565533615b8f00a65b897f0e8418 Mon Sep 17 00:00:00 2001 From: Sameeul B Samee Date: Sun, 11 Jun 2023 07:43:13 -0400 Subject: [PATCH 10/12] add verbosity --- recipe/bld.bat | 2 +- recipe/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 518ecc6..d4f5293 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,5 +1,5 @@ set CMAKE_GENERATOR_PLATFORM= set CMAKE_GENERATOR_TOOLSET= set CMAKE_GENERATOR=Ninja -set CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX " +set CMAKE_ARGS=-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX python -m pip install . -vv \ No newline at end of file diff --git a/recipe/build.sh b/recipe/build.sh index 61456bd..b8592ea 100644 --- 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 From bc473ba9e2bbf65c849b5353d45c5c3b3c556757 Mon Sep 17 00:00:00 2001 From: Sameeul B Samee Date: Sun, 11 Jun 2023 07:52:32 -0400 Subject: [PATCH 11/12] fix lint --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index d4f5293..c6468e0 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,5 +1,5 @@ set CMAKE_GENERATOR_PLATFORM= set CMAKE_GENERATOR_TOOLSET= set CMAKE_GENERATOR=Ninja -set CMAKE_ARGS=-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX +set CMAKE_ARGS=-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX python -m pip install . -vv \ No newline at end of file From a7a37f3dd8eb63e9d0fa4d0f3cf0bd810cb1d97c Mon Sep 17 00:00:00 2001 From: Sameeul B Samee Date: Sun, 11 Jun 2023 10:52:08 -0400 Subject: [PATCH 12/12] minor updates --- recipe/{win_2022.patch => 0000-win_2022.patch} | 16 +++++++++++----- recipe/bld.bat | 2 +- recipe/meta.yaml | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) rename recipe/{win_2022.patch => 0000-win_2022.patch} (50%) diff --git a/recipe/win_2022.patch b/recipe/0000-win_2022.patch similarity index 50% rename from recipe/win_2022.patch rename to recipe/0000-win_2022.patch index 3a62a52..3817575 100644 --- a/recipe/win_2022.patch +++ b/recipe/0000-win_2022.patch @@ -1,14 +1,20 @@ diff --git a/setup.py b/setup.py -index 4cb904b..bfb76ee 100644 +index 4cb904b..2a9d48a 100644 --- a/setup.py +++ b/setup.py -@@ -59,9 +59,9 @@ class CMakeBuild(build_ext): - cmake_args += [ - "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}".format(cfg.upper(), extdir) - ] +@@ -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"] diff --git a/recipe/bld.bat b/recipe/bld.bat index c6468e0..d4f5293 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,5 +1,5 @@ set CMAKE_GENERATOR_PLATFORM= set CMAKE_GENERATOR_TOOLSET= set CMAKE_GENERATOR=Ninja -set CMAKE_ARGS=-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX +set CMAKE_ARGS=-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX python -m pip install . -vv \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 491484f..aa2fabb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,9 +9,9 @@ source: url: https://github.com/PolusAI/{{ name }}/archive/refs/tags/{{ version }}.tar.gz sha256: e89c37bfe8c32d060c9eaa36aebf5ccc3d4bff8afee6b26176fe04a279f45748 patches: - - win_2022.patch + - 0000-win_2022.patch build: - number: 3 + number: 4 skip: true # [py<36] missing_dso_whitelist: - '*/nvcuda.dll' # [win]