Try to apply fix that will make the image converter build.

mlpack · Mar 22, 2024 · 0598db2 · 0598db2
1 parent 89003f4
commit 0598db2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/.github/workflows/windows-arm64-wheels.yml b/.github/workflows/windows-arm64-wheels.yml
@@ -87,10 +87,11 @@ jobs:
           git clone https://github.com/mlpack/mlpack
           cd mlpack
           git checkout $MLPACK_VERSION
-          # Apply patches to install Python headers.
+          # Apply patches to install Python headers and fix STB detection.
           cp ../ConfigureFileOnly.cmake CMake/
           cp ../mlpack.pc.in src/mlpack/bindings/python/
           patch -p1 < ../python-install-headers.patch
+          patch -p1 < ../stb-cmake-fix.patch
 
       - name: Generate setup.py
         shell: powershell

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -31,6 +31,7 @@ pipeline
           cp ../ConfigureFileOnly.cmake CMake/
           cp ../mlpack.pc.in src/mlpack/bindings/python/
           patch -p1 < ../python-install-headers.patch
+          patch -p1 < ../stb-cmake-fix.patch
 
           mkdir build/
           cd build/

diff --git a/azure-pipelines-macos-steps.yml b/azure-pipelines-macos-steps.yml
@@ -16,10 +16,11 @@ steps:
       sed -i.bk 's/${PACKAGE_VERSION}/${PACKAGE_VERSION}.post1/g' src/mlpack/bindings/python/setup.py.in
       rm -f src/mlpack/bindings/python/setup.py.in.bk
 
-      # Apply patches to install Python headers.
+      # Apply patches to install Python headers and fix STB detection.
       cp ../ConfigureFileOnly.cmake CMake/
       cp ../mlpack.pc.in src/mlpack/bindings/python/
       patch -p1 < ../python-install-headers.patch
+      patch -p1 < ../stb-cmake-fix.patch
     displayName: Clone mlpack
 
   - bash: |

diff --git a/azure-pipelines-windows-steps.yml b/azure-pipelines-windows-steps.yml
@@ -58,10 +58,11 @@ steps:
       sed -i.bk 's/${PACKAGE_VERSION}/${PACKAGE_VERSION}.post1/g' src/mlpack/bindings/python/setup.py.in
       rm -f src/mlpack/bindings/python/setup.py.in.bk
 
-      # Apply patches to install Python headers.
+      # Apply patches to install Python headers and fix STB detection.
       cp ../ConfigureFileOnly.cmake CMake/
       cp ../mlpack.pc.in src/mlpack/bindings/python/
       patch -p1 < ../python-install-headers.patch
+      patch -p1 < ../stb-cmake-fix.patch
     displayName: Clone mlpack
 
   - powershell: |

diff --git a/stb-cmake-fix.patch b/stb-cmake-fix.patch
@@ -0,0 +1,19 @@
+--- mlpack-4.3.0/CMakeLists.txt	2023-11-27 13:27:20.000000000 -0500
++++ mlpack-4.3.0-mod/CMakeLists.txt	2024-03-22 11:41:28.569175709 -0400
+@@ -312,14 +312,14 @@
+   find_package(StbImage)
+ else()
+   find_package(StbImage)
+-  if (NOT STB_IMAGE_FOUND)
++  if (NOT StbImage_FOUND)
+     get_deps(https://mlpack.org/files/stb.tar.gz stb stb.tar.gz)
+     set(STB_IMAGE_INCLUDE_DIR ${GENERIC_INCLUDE_DIR})
+     find_package(StbImage REQUIRED)
+   endif()
+ endif()
+
+-if (STB_IMAGE_FOUND)
++if (StbImage_FOUND)
+   set(STB_AVAILABLE "1")
+   set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} "${STB_IMAGE_INCLUDE_DIR}")
+