Merge pull request #29 from carterbox/missing-headers

BUG: Add missing headers
conda-forge · Apr 11, 2023 · be97f11 · be97f11
2 parents 19376fb + 411fdc1
commit be97f11
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 28 deletions.
diff --git a/recipe/install_headers.bat b/recipe/install_headers.bat
@@ -1,6 +1,8 @@
 @echo on
 
-xcopy /s /k /y .\include\*.h %LIBRARY_PREFIX%
+md %LIBRARY_PREFIX%\include
+xcopy /s /k /y .\include\*.h %LIBRARY_PREFIX%\include
+xcopy /s /k /y .\sparse\include\*.h %LIBRARY_PREFIX%\include
 cp .\build\include\magma_config.h %LIBRARY_PREFIX%\include\magma_config.h
 md  %LIBRARY_PREFIX%\lib\pkgconfig
 cp .\build\lib\pkgconfig\magma.pc %LIBRARY_PREFIX%\lib\pkgconfig\magma.pc

diff --git a/recipe/install_headers.sh b/recipe/install_headers.sh
@@ -1,5 +1,7 @@
 set -exv
 
-cp -pr ./include/*.h $PREFIX
+mkdir $PREFIX/include
+cp -pr ./include/*.h $PREFIX/include
+cp -pr ./sparse/include/*.h $PREFIX/include
 install -D ./build/include/magma_config.h $PREFIX/include/magma_config.h
 install -D ./build/lib/pkgconfig/magma.pc $PREFIX/lib/pkgconfig/magma.pc
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -99,7 +99,7 @@ source:
       - manual-link.patch
 
 build:
-  number: 1
+  number: 2
   skip: true  # [cuda_compiler_version == "None"]
   skip: true  # [cuda_compiler_version == "10.2"]
   skip: true  # [cuda_compiler_version == "11.0"]
@@ -171,31 +171,30 @@ outputs:
       run:
         - libmagma {{ version }}
         - libmagma_sparse {{ version }}
-
-      test:
-        commands:
-          - test -f $PREFIX/include/magma.h                        # [unix]
-          - if not exist %LIBRARY_PREFIX%\include\magma.h exit 1         # [win]
-          - test -f $PREFIX/lib/libmagma${SHLIB_EXT}                 # [unix]
-          - if not exist %LIBRARY_PREFIX%\lib\magma.lib exit 1       # [win]
-          - if not exist %LIBRARY_PREFIX%\bin\magma.dll exit 1       # [win]
-          - test -f $PREFIX/lib/libmagma_sparse${SHLIB_EXT}        # [unix]
-          - if not exist %LIBRARY_PREFIX%\lib\magma_sparse.lib exit 1    # [win]
-          - if not exist %LIBRARY_PREFIX%\bin\magma_sparse.dll exit 1    # [win]
-          - test -f $PREFIX/lib/pkgconfig/magma.pc                 # [unix]
-          - if not exist %LIBRARY_PREFIX%\lib\pkgconfig\magma.pc exit 1  # [win]
-      {% for each_header in magma_headers %}
-          - test -f $PREFIX/include/magma_{{ each_header }}.h                 # [unix]
-          - if not exist %LIBRARY_PREFIX%\include\magma_{{ each_header }}.h exit 1  # [win]
-      {% endfor %}
-      {% for each_header in magmasparse_headers %}
-          - test -f $PREFIX/include/magmasparse_{{ each_header }}.h                 # [unix]
-          - if not exist %LIBRARY_PREFIX%\include\magmasparse_{{ each_header }}.h exit 1  # [win]
-      {% endfor %}
-      {% for each_header in magmablas_headers %}
-          - test -f $PREFIX/include/magmablas_{{ each_header }}.h                 # [unix]
-          - if not exist %LIBRARY_PREFIX%\include\magmablas_{{ each_header }}.h exit 1  # [win]
-      {% endfor %}
+    test:
+      commands:
+        - test -f $PREFIX/include/magma.h                        # [unix]
+        - if not exist %LIBRARY_PREFIX%\include\magma.h exit 1         # [win]
+        - test -f $PREFIX/lib/libmagma${SHLIB_EXT}                 # [unix]
+        - if not exist %LIBRARY_PREFIX%\lib\magma.lib exit 1       # [win]
+        - if not exist %LIBRARY_PREFIX%\bin\magma.dll exit 1       # [win]
+        - test -f $PREFIX/lib/libmagma_sparse${SHLIB_EXT}        # [unix]
+        - if not exist %LIBRARY_PREFIX%\lib\magma_sparse.lib exit 1    # [win]
+        - if not exist %LIBRARY_PREFIX%\bin\magma_sparse.dll exit 1    # [win]
+        - test -f $PREFIX/lib/pkgconfig/magma.pc                 # [unix]
+        - if not exist %LIBRARY_PREFIX%\lib\pkgconfig\magma.pc exit 1  # [win]
+{% for each_header in magma_headers %}
+        - test -f $PREFIX/include/magma_{{ each_header }}.h                 # [unix]
+        - if not exist %LIBRARY_PREFIX%\include\magma_{{ each_header }}.h exit 1  # [win]
+{% endfor %}
+{% for each_header in magmasparse_headers %}
+        - test -f $PREFIX/include/magmasparse_{{ each_header }}.h                 # [unix]
+        - if not exist %LIBRARY_PREFIX%\include\magmasparse_{{ each_header }}.h exit 1  # [win]
+{% endfor %}
+{% for each_header in magmablas_headers %}
+        - test -f $PREFIX/include/magmablas_{{ each_header }}.h                 # [unix]
+        - if not exist %LIBRARY_PREFIX%\include\magmablas_{{ each_header }}.h exit 1  # [win]
+{% endfor %}
 
 about:
   home: http://icl.cs.utk.edu/magma/software/index.html