From 3670976663b8498adb7be26e7f282184929d4893 Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 11:37:39 +0100
Subject: [PATCH 01/21] Change floor and ceil to floorf and ceilf

---
 cpp_cuda_c/src/spline_psf_gpu.cu | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cpp_cuda_c/src/spline_psf_gpu.cu b/cpp_cuda_c/src/spline_psf_gpu.cu
index 0967837..b9d74cf 100644
--- a/cpp_cuda_c/src/spline_psf_gpu.cu
+++ b/cpp_cuda_c/src/spline_psf_gpu.cu
@@ -522,17 +522,17 @@ auto kernel_roi(spline *sp, float *rois, const int npx, const int npy, const flo
     float phot = phot_[r];
 
     /* Compute delta. Will be the same for all following px */
-    x0 = (int)floor(xc);
+    x0 = (int)floorf(xc);
     x_delta = xc - x0;
 
-    y0 = (int)floor(yc);
+    y0 = (int)floorf(yc);
     y_delta = yc - y0;
 
-    z0 = (int)floor(zc);
+    z0 = (int)floorf(zc);
     z_delta = zc - z0;
 
     int n_threads = min(1024, npx * npy);  // max number of threads per block
-    int n_blocks = ceil(static_cast<float>(npx * npy) / static_cast<float>(n_threads));
+    int n_blocks = ceilf(static_cast<float>(npx * npy) / static_cast<float>(n_threads));
 
     fAt3Dj<<<n_blocks, n_threads>>>(sp, rois, r, npx, npy, x0, y0, z0, phot, x_delta, y_delta, z_delta);
 
@@ -555,17 +555,17 @@ auto kernel_derivative_roi(spline *sp, float *rois, float *drv_rois, const int n
     float bg = bg_[r];
 
     /* Compute delta. Will be the same for all following px */
-    x0 = (int)floor(xc);
+    x0 = (int)floorf(xc);
     x_delta = xc - x0;
 
-    y0 = (int)floor(yc);
+    y0 = (int)floorf(yc);
     y_delta = yc - y0;
 
-    z0 = (int)floor(zc);
+    z0 = (int)floorf(zc);
     z_delta = zc - z0;
 
     int n_threads = min(1024, npx * npy);  // max number of threads per block
-    int n_blocks = ceil(static_cast<float>(npx * npy) / static_cast<float>(n_threads));
+    int n_blocks = ceilf(static_cast<float>(npx * npy) / static_cast<float>(n_threads));
 
     kernel_derivative<<<n_blocks, n_threads>>>(sp, rois, drv_rois, r, npx, npy, x0, y0, z0, phot, bg, x_delta, y_delta, z_delta, add_bg);
 

From 0a257a9d26f7d40616f8fa3d07a7eade510c151b Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 11:41:41 +0100
Subject: [PATCH 02/21] Install cuda in workflow

---
 .github/workflows/build_upload_test.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index 1106551..93ff689 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -52,6 +52,14 @@ jobs:
         if: ${{ matrix.os_base == 'macos'}}
         run: sudo xcode-select --switch /Applications/Xcode_11.5.app/Contents/Developer
 
+      - name: Install CUDA (Ubuntu/Windows)
+        if: ${{ matrix.os_base == 'ubuntu' || matrix.os_base == 'windows'}}
+        uses: Jimver/cuda-toolkit@v0.2.1
+        with:
+          cuda: '11.2.2'
+          method: 'network'
+          subPackages: '["nvcc"]'
+
       - name: Build SplinePSF (UNIX)
         if: ${{ matrix.os_base == 'ubuntu' || matrix.os_base == 'macos'}}
         run: |

From f2d104cc17b3e95ccb60d90e82e3e284dca6fedb Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 11:43:28 +0100
Subject: [PATCH 03/21] Use cmake 3.17

---
 cpp_cuda_c/CMakeLists.txt | 4 ++--
 python/environment.yml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpp_cuda_c/CMakeLists.txt b/cpp_cuda_c/CMakeLists.txt
index 99a0358..cf78ea3 100644
--- a/cpp_cuda_c/CMakeLists.txt
+++ b/cpp_cuda_c/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.17 FATAL_ERROR)
 #cmake_policy(SET CMP0094 NEW)
 
 project(SplinePSF LANGUAGES CXX C)
@@ -8,7 +8,7 @@ check_language(CUDA)
 
 find_package(Python COMPONENTS Interpreter Development)
 find_package(pybind11 REQUIRED)
-find_package(CUDA)
+find_package(CUDAToolkit)
 
 if(CMAKE_CUDA_COMPILER AND NOT CUDA_DISABLED)  # the latter is a user definable variable
    enable_language(CUDA)
diff --git a/python/environment.yml b/python/environment.yml
index bedaf3e..6f7f8c2 100755
--- a/python/environment.yml
+++ b/python/environment.yml
@@ -4,7 +4,7 @@ channels:
 dependencies:
   - bump2version
   - python=3.7
-  - cmake=3.15
+  - cmake=3.17
   - ninja
   - setuptools
   - numpy

From aa33a6c5241e38fb704aad1c011c45889ce4d7ca Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 11:52:41 +0100
Subject: [PATCH 04/21] Fix cuda input name

---
 .github/workflows/build_upload_test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index 93ff689..b9a7878 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -58,7 +58,7 @@ jobs:
         with:
           cuda: '11.2.2'
           method: 'network'
-          subPackages: '["nvcc"]'
+          sub-packages: '["nvcc"]'
 
       - name: Build SplinePSF (UNIX)
         if: ${{ matrix.os_base == 'ubuntu' || matrix.os_base == 'macos'}}

From b857ed7fc15c50107a8f6f70889a88ac94d89676 Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 11:56:11 +0100
Subject: [PATCH 05/21] Update cmake to 3.17

---
 dist_tools/conda/spline/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist_tools/conda/spline/meta.yaml b/dist_tools/conda/spline/meta.yaml
index b274754..b56ba52 100644
--- a/dist_tools/conda/spline/meta.yaml
+++ b/dist_tools/conda/spline/meta.yaml
@@ -13,7 +13,7 @@ requirements:
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
     - python
-    - cmake =3.15
+    - cmake =3.17
     - ninja
     - setuptools
 

From de52d49effc58bcd17c46304e28009e372d6f3bd Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 12:12:31 +0100
Subject: [PATCH 06/21] Comment link/include cuda dirs

---
 cpp_cuda_c/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp_cuda_c/CMakeLists.txt b/cpp_cuda_c/CMakeLists.txt
index cf78ea3..b56cb49 100644
--- a/cpp_cuda_c/CMakeLists.txt
+++ b/cpp_cuda_c/CMakeLists.txt
@@ -34,8 +34,8 @@ if(CMAKE_CUDA_COMPILER AND NOT CUDA_DISABLED)
    target_compile_features(spline_psf_cu_impl PUBLIC cxx_std_11)
    set_target_properties(spline_psf_cu_impl PROPERTIES CUDA_SEPARABLE_COMPILATION ON POSITION_INDEPENDENT_CODE ON)
 
-   link_directories(/usr/local/cuda/lib64)
-   include_directories("${CUDA_INCLUDE_DIRS}")
+   # link_directories(/usr/local/cuda/lib64)
+   # include_directories("${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}")
 
    pybind11_add_module(spline src/pybind_spline.cpp)
    target_link_libraries(spline PRIVATE spline_psf_cu_impl spline_psf_cpu_impl)

From 598e730a466d8bcd2406dd915ab706427742aff3 Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 12:42:41 +0100
Subject: [PATCH 07/21] Remove sub package

---
 .github/workflows/build_upload_test.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index b9a7878..86292ef 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -57,8 +57,6 @@ jobs:
         uses: Jimver/cuda-toolkit@v0.2.1
         with:
           cuda: '11.2.2'
-          method: 'network'
-          sub-packages: '["nvcc"]'
 
       - name: Build SplinePSF (UNIX)
         if: ${{ matrix.os_base == 'ubuntu' || matrix.os_base == 'macos'}}

From 732c6ba9c1ce1aa1639b1d617a35cdeb4584cc44 Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 13:08:37 +0100
Subject: [PATCH 08/21] Fix cuda found variable

---
 cpp_cuda_c/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp_cuda_c/CMakeLists.txt b/cpp_cuda_c/CMakeLists.txt
index b56cb49..84af0a0 100644
--- a/cpp_cuda_c/CMakeLists.txt
+++ b/cpp_cuda_c/CMakeLists.txt
@@ -10,7 +10,7 @@ find_package(Python COMPONENTS Interpreter Development)
 find_package(pybind11 REQUIRED)
 find_package(CUDAToolkit)
 
-if(CMAKE_CUDA_COMPILER AND NOT CUDA_DISABLED)  # the latter is a user definable variable
+if(CUDAToolkit_FOUND AND NOT CUDA_DISABLED)  # the latter is a user definable variable
    enable_language(CUDA)
    add_compile_definitions(CUDA_ENABLED)
 
@@ -28,7 +28,7 @@ target_include_directories(spline_psf_cpu_impl PUBLIC include)
 target_compile_features(spline_psf_cpu_impl PUBLIC c_std_99)
 set_property(TARGET spline_psf_cpu_impl PROPERTY POSITION_INDEPENDENT_CODE ON)
 
-if(CMAKE_CUDA_COMPILER AND NOT CUDA_DISABLED)
+if(CUDAToolkit_FOUND AND NOT CUDA_DISABLED)
    add_library(spline_psf_cu_impl STATIC src/spline_psf_gpu.cu)
    target_include_directories(spline_psf_cu_impl PUBLIC include)
    target_compile_features(spline_psf_cu_impl PUBLIC cxx_std_11)

From c8badbd9c833c3c1b3735aebf50f9f1d4a0ef155 Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 13:11:01 +0100
Subject: [PATCH 09/21] Only install cuda on windows

---
 .github/workflows/build_upload_test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index 86292ef..a20d338 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -52,8 +52,8 @@ jobs:
         if: ${{ matrix.os_base == 'macos'}}
         run: sudo xcode-select --switch /Applications/Xcode_11.5.app/Contents/Developer
 
-      - name: Install CUDA (Ubuntu/Windows)
-        if: ${{ matrix.os_base == 'ubuntu' || matrix.os_base == 'windows'}}
+      - name: Install CUDA (Windows)
+        if: ${{matrix.os_base == 'windows'}}
         uses: Jimver/cuda-toolkit@v0.2.1
         with:
           cuda: '11.2.2'

From cbee21a971218731d2fa7a5c15e2b501285ff0de Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 15:44:22 +0100
Subject: [PATCH 10/21] Update to vs2019

---
 dist_tools/conda/conda_build_config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist_tools/conda/conda_build_config.yaml b/dist_tools/conda/conda_build_config.yaml
index 9120aac..b040bae 100644
--- a/dist_tools/conda/conda_build_config.yaml
+++ b/dist_tools/conda/conda_build_config.yaml
@@ -2,11 +2,11 @@
 c_compiler:
     - clang                            # [osx]
     - gcc                              # [linux]
-    - vs2017                           # [win]
+    - vs2019                           # [win]
 cxx_compiler:
     - clangxx                          # [osx]
     - gxx                              # [linux]
-    - vs2017                           # [win]
+    - vs2019                           # [win]
 target_platform:
     - osx-64                           # [osx]
     - linux-64                         # [linux]

From d3bcfedefe1fb5ed012cfb3c3e36225549e1c2f1 Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 15:48:32 +0100
Subject: [PATCH 11/21] Print path on windows

---
 .github/workflows/build_upload_test.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index a20d338..2b868e3 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -66,6 +66,11 @@ jobs:
           conda-build -c conda-forge spline
           conda-build -c conda-forge spline --output > $FILENAMES
 
+      - name: Print path (Windows)
+        if: ${{ matrix.os_base == 'windows' }}
+        run: |
+          echo $env:PATH
+      
       - name: Build SplinePSF (Windows)
         if: ${{ matrix.os_base == 'windows' }}
         run: |

From 6fb8567bce9aab9765fadb5ed20a5c95e30355d0 Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 16:37:48 +0100
Subject: [PATCH 12/21] Upload error log

---
 .github/workflows/build_upload_test.yaml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index 2b868e3..1741e2f 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -65,11 +65,6 @@ jobs:
 
           conda-build -c conda-forge spline
           conda-build -c conda-forge spline --output > $FILENAMES
-
-      - name: Print path (Windows)
-        if: ${{ matrix.os_base == 'windows' }}
-        run: |
-          echo $env:PATH
       
       - name: Build SplinePSF (Windows)
         if: ${{ matrix.os_base == 'windows' }}
@@ -79,6 +74,12 @@ jobs:
           conda-build -c conda-forge spline
           conda-build -c conda-forge spline --output > $Env:FILENAMES
 
+      - name: Upload CMake error log
+        uses: actions/upload-artifact@v2
+        with:
+          name: CMakeError.log
+          path: python/build/**/Release/CMakeFiles/CMakeError.log
+
       - name: Change anaconda label on release
         if: github.event.release
         run: |

From 40fd8505c81500294faddf34ef95e072d84225e4 Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 17:12:33 +0100
Subject: [PATCH 13/21] Try to fix path

---
 .github/workflows/build_upload_test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index 1741e2f..1e884cf 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -78,7 +78,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: CMakeError.log
-          path: python/build/**/Release/CMakeFiles/CMakeError.log
+          path: ${{ github.workspace }}/python/build/**/Release/CMakeFiles/CMakeError.log
 
       - name: Change anaconda label on release
         if: github.event.release

From 7078c2e7d3440274847195ebd624022d49a2a164 Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 17:23:59 +0100
Subject: [PATCH 14/21] Wildcard CMakeError.log

---
 .github/workflows/build_upload_test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index 1e884cf..a88cae3 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -78,7 +78,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: CMakeError.log
-          path: ${{ github.workspace }}/python/build/**/Release/CMakeFiles/CMakeError.log
+          path: '**/CMakeError.log'
 
       - name: Change anaconda label on release
         if: github.event.release

From bdd0dd6b8fe585cb6d0197a254bf03e4b991560d Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 17:31:27 +0100
Subject: [PATCH 15/21] More specific error log path

---
 .github/workflows/build_upload_test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index a88cae3..ac2ee9b 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -78,7 +78,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: CMakeError.log
-          path: '**/CMakeError.log'
+          path: '**/python/build/**/Release/CMakeFiles/CMakeError.log'
 
       - name: Change anaconda label on release
         if: github.event.release

From a0dccf99d42f6b913fc85b4dfb9c97935b90642c Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 17:59:18 +0100
Subject: [PATCH 16/21] More artifact paths

---
 .github/workflows/build_upload_test.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index ac2ee9b..0142d8d 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -78,7 +78,12 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: CMakeError.log
-          path: '**/python/build/**/Release/CMakeFiles/CMakeError.log'
+          path: |
+            C:/Miniconda/envs/test/conda-bld/*/work/python/build/temp.win-amd64-3.6/Release/CMakeFiles/CMakeError.log
+            C:/Miniconda/envs/test/conda-bld/*/work/python/build/temp.win-amd64-3.6/Release/CMakeFiles/CMakeOutput.log
+            C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.2/bin/nvcc.exe
+            **/python/build/**/Release/CMakeFiles/CMakeError.log
+            **/python/build/**/Release/CMakeFiles/CMakeOutput.log
 
       - name: Change anaconda label on release
         if: github.event.release

From 63d752f3f836631553a4bb35980385b10572459f Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Fri, 26 Mar 2021 18:29:10 +0100
Subject: [PATCH 17/21] Split artifacts

---
 .github/workflows/build_upload_test.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index 0142d8d..48b3628 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -81,7 +81,12 @@ jobs:
           path: |
             C:/Miniconda/envs/test/conda-bld/*/work/python/build/temp.win-amd64-3.6/Release/CMakeFiles/CMakeError.log
             C:/Miniconda/envs/test/conda-bld/*/work/python/build/temp.win-amd64-3.6/Release/CMakeFiles/CMakeOutput.log
-            C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.2/bin/nvcc.exe
+
+      - name: Upload other CMake error log
+        uses: actions/upload-artifact@v2
+        with:
+          name: Other_CmakeError.log
+          path: |
             **/python/build/**/Release/CMakeFiles/CMakeError.log
             **/python/build/**/Release/CMakeFiles/CMakeOutput.log
 

From ce4c79fb5d93a9595ef93561d08a68cf3a2f8640 Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Sat, 27 Mar 2021 13:14:32 +0100
Subject: [PATCH 18/21] More wildcards

---
 .github/workflows/build_upload_test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index 48b3628..24f3db2 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -79,8 +79,8 @@ jobs:
         with:
           name: CMakeError.log
           path: |
-            C:/Miniconda/envs/test/conda-bld/*/work/python/build/temp.win-amd64-3.6/Release/CMakeFiles/CMakeError.log
-            C:/Miniconda/envs/test/conda-bld/*/work/python/build/temp.win-amd64-3.6/Release/CMakeFiles/CMakeOutput.log
+            C:/Miniconda/envs/test/conda-bld/*/work/python/build/temp.win-amd64-3.*/Release/CMakeFiles/CMakeError.log
+            C:/Miniconda/envs/test/conda-bld/*/work/python/build/temp.win-amd64-3.*/Release/CMakeFiles/CMakeOutput.log
 
       - name: Upload other CMake error log
         uses: actions/upload-artifact@v2

From 37476e1766cdcef391823c1ca4140f1cd5c40cf4 Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Sat, 27 Mar 2021 13:17:54 +0100
Subject: [PATCH 19/21] List dir

---
 .github/workflows/build_upload_test.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index 24f3db2..cc78465 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -74,6 +74,10 @@ jobs:
           conda-build -c conda-forge spline
           conda-build -c conda-forge spline --output > $Env:FILENAMES
 
+      - name: List dir
+        run: |
+          Get-ChildItem -Recurse "C:/Miniconda/envs/test/conda-bld/"
+
       - name: Upload CMake error log
         uses: actions/upload-artifact@v2
         with:

From 476605105ab2468710804a7bd6eea7e580c3942f Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Sat, 27 Mar 2021 14:20:26 +0100
Subject: [PATCH 20/21] Set VSCMD_DEBUG to 3

---
 .github/workflows/build_upload_test.yaml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index cc78465..dce4361 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -70,14 +70,10 @@ jobs:
         if: ${{ matrix.os_base == 'windows' }}
         run: |
           Set-Location -Path .\dist_tools\conda
-
+          [System.Environment]::SetEnvironmentVariable('VSCMD_DEBUG','3',[System.EnvironmentVariableTarget]::User)
           conda-build -c conda-forge spline
           conda-build -c conda-forge spline --output > $Env:FILENAMES
 
-      - name: List dir
-        run: |
-          Get-ChildItem -Recurse "C:/Miniconda/envs/test/conda-bld/"
-
       - name: Upload CMake error log
         uses: actions/upload-artifact@v2
         with:

From e9e81c0bddafe1d9ff5bb920d62b2befe7046272 Mon Sep 17 00:00:00 2001
From: Jim Verheijde <jim.verheijde@hotmail.com>
Date: Sat, 27 Mar 2021 17:21:40 +0100
Subject: [PATCH 21/21] Set env differently

---
 .github/workflows/build_upload_test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_upload_test.yaml b/.github/workflows/build_upload_test.yaml
index dce4361..c40783e 100644
--- a/.github/workflows/build_upload_test.yaml
+++ b/.github/workflows/build_upload_test.yaml
@@ -70,7 +70,7 @@ jobs:
         if: ${{ matrix.os_base == 'windows' }}
         run: |
           Set-Location -Path .\dist_tools\conda
-          [System.Environment]::SetEnvironmentVariable('VSCMD_DEBUG','3',[System.EnvironmentVariableTarget]::User)
+          $env:VSCMD_DEBUG=3
           conda-build -c conda-forge spline
           conda-build -c conda-forge spline --output > $Env:FILENAMES