Merge pull request #2 from GraphBLAS/brock/fixes-for-macos

Add CI, small fixes to work with Mac OS.

Author: BenBrock

.github/workflows/ci.yml

@@ -0,0 +1,56 @@
+name: "CI"
+
+on:
+  push:
+    branches:
+      - main
+
+  pull_request:
+
+jobs:
+  checks:
+    runs-on: 'ubuntu-latest'
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.12'
+        cache: 'pip'
+    - run: pip install -r requirements.txt
+    - name: Checks
+      uses: pre-commit/[email protected]
+
+  gcc:
+    runs-on: 'ubuntu-latest'
+    strategy:
+      matrix:
+        cxx: [g++-12, clang++]
+    name: ${{ matrix.cxx }}
+    env:
+      CXX: ${{ matrix.cxx }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: CMake
+      run: |
+        sudo apt-get update
+        sudo apt-get install libhdf5-dev g++-12
+        cmake -B build
+    - name: Build
+      run: make -C build -j `nproc`
+    - name: Test
+      run: |
+        ./build/test/gtest/binsparse-tests
+
+  macos:
+    runs-on: 'macos-latest'
+    steps:
+    - uses: actions/checkout@v4
+    - name: CMake
+      run: |
+        brew install hdf5
+        cmake -B build
+    - name: Build
+      run: make -C build -j
+    - name: Test
+      run: |
+        ./build/test/gtest/binsparse-tests

CMakeLists.txt

@@ -6,9 +6,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_subdirectory(include)
 
-find_package(HDF5 REQUIRED COMPONENTS CXX)
-target_link_libraries(binsparse INTERFACE ${HDF5_CXX_LIBRARIES})
-target_include_directories(binsparse INTERFACE . ${HDF5_INCLUDE_DIRS})
+find_package(HDF5 REQUIRED COMPONENTS C CXX)
+target_link_libraries(binsparse INTERFACE ${HDF5_C_LIBRARIES} hdf5::hdf5_cpp)
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
   # Dependencies needed only for examples/test

include/binsparse/hdf5_tools.hpp

@@ -2,6 +2,7 @@
 
 #include <H5Cpp.h>
 #include <cassert>
+#include <cstdint>
 #include <ranges>
 #include <type_traits>
 #include <vector>

include/binsparse/type_info.hpp

@@ -45,8 +45,9 @@ struct type_info<uint64_t> {
   }
 };
 
-template <>
-struct type_info<std::size_t> {
+template <typename T>
+  requires std::is_same_v<T, std::size_t>
+struct type_info<T> {
   static constexpr auto label() noexcept {
     return "uint64";
   }

test/gtest/CMakeLists.txt

@@ -5,14 +5,16 @@ function(download_data url file_name)
        ${url}
        ${DATASET_ARCHIVE})
 
- string(REPLACE
+  string(REPLACE
         ".tar.gz" ""
-        DATSET_DIR
+        DATASET_DIR
         ${DATASET_ARCHIVE})
 
- file(ARCHIVE_EXTRACT INPUT
-      ${DATASET_ARCHIVE}
-      ${DATASET_DIR})
+  cmake_path(REMOVE_FILENAME DATASET_DIR)
+
+  file(ARCHIVE_EXTRACT INPUT ${DATASET_ARCHIVE} DESTINATION ${DATASET_DIR})
+
+  message(STATUS "Downloading file ${DATASET_ARCHIVE}, extracting to ${DATASET_DIR}.")
 endfunction()
 
 enable_testing()

test/gtest/coo_test.cpp

@@ -1,20 +1,19 @@
-#include <gtest/gtest.h>
-
-#include <fmt/core.h>
-
+#include "util.hpp"
 #include <binsparse/binsparse.hpp>
-
-inline std::vector file_paths({"1138_bus/1138_bus.mtx",
-                               "chesapeake/chesapeake.mtx",
-                               "mouse_gene/mouse_gene.mtx"});
+#include <filesystem>
+#include <fmt/core.h>
+#include <gtest/gtest.h>
 
 TEST(BinsparseReadWrite, COOFormat) {
   using T = float;
   using I = std::size_t;
 
   std::string binsparse_file = "out.bsp.hdf5";
 
-  for (auto&& file_path : file_paths) {
+  auto base_path = find_prefix(files.front());
+
+  for (auto&& file : files) {
+    auto file_path = base_path + file;
     auto x = binsparse::__detail::mmread<
         T, I, binsparse::__detail::coo_matrix_owning<T, I>>(file_path);
 
@@ -46,4 +45,6 @@ TEST(BinsparseReadWrite, COOFormat) {
     delete matrix_.rowind;
     delete matrix_.colind;
   }
+
+  std::filesystem::remove(binsparse_file);
 }

test/gtest/csr_test.cpp

@@ -1,20 +1,19 @@
-#include <gtest/gtest.h>
-
-#include <fmt/core.h>
-
+#include "util.hpp"
 #include <binsparse/binsparse.hpp>
-
-inline std::vector file_paths({"1138_bus/1138_bus.mtx",
-                               "chesapeake/chesapeake.mtx",
-                               "mouse_gene/mouse_gene.mtx"});
+#include <filesystem>
+#include <fmt/core.h>
+#include <gtest/gtest.h>
 
 TEST(BinsparseReadWrite, CSRFormat) {
   using T = float;
   using I = std::size_t;
 
   std::string binsparse_file = "out.bsp.hdf5";
 
-  for (auto&& file_path : file_paths) {
+  auto base_path = find_prefix(files.front());
+
+  for (auto&& file : files) {
+    auto file_path = base_path + file;
     auto x = binsparse::__detail::mmread<
         T, I, binsparse::__detail::csr_matrix_owning<T, I>>(file_path);
 
@@ -46,4 +45,6 @@ TEST(BinsparseReadWrite, CSRFormat) {
     delete matrix_.row_ptr;
     delete matrix_.colind;
   }
+
+  std::filesystem::remove(binsparse_file);
 }

test/gtest/util.hpp

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <filesystem>
+#include <string>
+#include <vector>
+
+inline std::vector<std::string> files({"data/1138_bus/1138_bus.mtx",
+                                       "data/chesapeake/chesapeake.mtx",
+                                       "data/mouse_gene/mouse_gene.mtx"});
+
+inline std::string find_prefix(std::string file_name) {
+  if (std::filesystem::exists("../../" + file_name)) {
+    return "../../";
+  } else if (std::filesystem::exists("build/" + file_name)) {
+    return "build/";
+  } else {
+    return "";
+  }
+}