Merge pull request #855 from wildmeshing/mtao/update_hashes

mtao · web-flow · commit e65c6cdfbfd1 · 2025-02-14T17:29:24.000-05:00
updating repo locations
diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   CTEST_OUTPUT_ON_FAILURE: ON
-  CTEST_PARALLEL_LEVEL: 2
+  CTEST_PARALLEL_LEVEL: 8
 
 jobs:
   ####################
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -10,12 +10,13 @@ on:
 
 env:
   CTEST_OUTPUT_ON_FAILURE: ON
-  CTEST_PARALLEL_LEVEL: 2
+  CTEST_PARALLEL_LEVEL: 8
 
 jobs:
   Linux:
     name: ${{ matrix.name }}
-    runs-on: ${{ matrix.os }}
+    runs-on: [self-hosted,Linux]
+    # runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
@@ -30,12 +31,7 @@ jobs:
           fetch-depth: 10
 
       - name: Dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get -o Acquire::Retries=3 install \
-          lcov \
-          ccache
-          echo 'CACHE_PATH=~/.cache/ccache' >> "$GITHUB_ENV"
+        run: echo 'CACHE_PATH=~/.cache/ccache' >> "$GITHUB_ENV"
 
       - name: Cache Build
         id: cache-build
@@ -47,7 +43,7 @@ jobs:
 
       - name: Prepare ccache
         run: |
-          ccache --max-size=1.0G
+          ccache --max-size=10.0G
           ccache -V && ccache --show-stats && ccache --zero-stats
 
       - name: Configure
@@ -60,7 +56,7 @@ jobs:
             -DWMTK_CODE_COVERAGE=ON
 
       - name: Build
-        run: cd build; make -j2; ccache --show-stats
+        run: cd build; make -j8; ccache --show-stats
 
       - name: Run Coverage
         run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,6 +48,9 @@ option(WMTK_ENABLE_APPLICATIONS "Enable applications (required for any applicati
 option(WMTK_BUILD_DOCS "Build doxygen" OFF)
 option (BUILD_SHARED_LIBS "Build Shared Libraries" OFF) # we globally want to disable this option due to use of TBB
 
+
+
+
 option(WMTK_CODE_COVERAGE "Enable coverage reporting" OFF)
 
 add_library(wmtk_coverage_config INTERFACE)
@@ -167,12 +170,11 @@ if(MSVC)
     target_compile_definitions(wildmeshing_toolkit PUBLIC _SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS)
 endif()
 
-if(WILDMESHING_TOOLKIT_TOPLEVEL_PROJECT)
-    # Unit tests
-    enable_testing()
-    # data for unit tests
-    set(WMTK_DATA_ROOT "${CPM_SOURCE_CACHE}/wmtk_data/" CACHE PATH "Where should the toolkit download and look for test data?")
-endif()
+
+# git repo used for wmtk data if it is required.
+# use wmtk_download_data to obtain the path to the data
+set(WMTK_DATA_REPOSITORY https://github.com/wildmeshing/data.git CACHE STRING "Git repo for testing data" )
+set(WMTK_DATA_TAG 6f171d11283d2977913a1b4e6129f9808357baf9 CACHE STRING "git tag for testing data" )
 
 
 add_subdirectory(components)
@@ -205,8 +207,11 @@ if(WMTK_BUILD_DOCS)
     endif(DOXYGEN_FOUND)
 endif()
 
+
+
 # Compile extras only if this is a top-level project
 if(WILDMESHING_TOOLKIT_TOPLEVEL_PROJECT)
+    enable_testing()
     add_subdirectory(tests)
 endif()
 if(WMTK_ENABLE_APPLICATIONS)
diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
@@ -10,6 +10,7 @@ include(wmtk_add_application)
 include(wmtk_register_integration_test)
 include(wmtk_generate_test_config)
 
+
 add_subdirectory(utils)
 
 
diff --git a/applications/cdt_opt/CMakeLists.txt b/applications/cdt_opt/CMakeLists.txt
@@ -13,6 +13,4 @@ wmtk::wildmeshing
 wmtk::output)
 
 wmtk_register_integration_test(EXEC_NAME cdt_opt_app
-    CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cdt_opt_test_config.json
-    GIT_REPOSITORY "https://github.com/wildmeshing/data.git"
-    GIT_TAG d1063ed50de45a1bcae9f8b6ae9b8b1d42885abe)
+    CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cdt_opt_test_config.json)
diff --git a/applications/cmake/wmtk_register_integration_test.cmake b/applications/cmake/wmtk_register_integration_test.cmake
@@ -1,21 +1,18 @@
 macro(wmtk_register_integration_test )
 
  set(options )
- set(oneValueArgs EXEC_NAME CONFIG_FILE GIT_REPOSITORY GIT_TAG CONFIG_PATH EXTRA_ARGUMENTS)
+ set(oneValueArgs EXEC_NAME CONFIG_FILE CONFIG_PATH EXTRA_ARGUMENTS)
  set(multiValueArgs)
  cmake_parse_arguments("" "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
     include(CPM)
 
 
     MESSAGE(STATUS "Registering integration test for ${_EXEC_NAME}")
 
-    if(_GIT_REPOSITORY)
-        string(MD5 REPO_HASH "${_GIT_REPOSITORY}${_GIT_TAG}")
 
-        include(wmtk_download_data)
-        wmtk_download_data(DATA_DIR ${_GIT_REPOSITORY} ${_GIT_TAG})
-        set(DATA_DIR_LINE  "\"data_folder\":\"${DATA_DIR}\"," )
-    endif()
+    include(wmtk_download_data)
+    wmtk_download_data()
+    set(DATA_DIR_LINE  "\"data_folder\":\"${DATA_DIR}\"," )
 
     if(NOT _CONFIG_PATH)
         set(_CONFIG_PATH ${DATA_DIR})
diff --git a/applications/convert/CMakeLists.txt b/applications/convert/CMakeLists.txt
@@ -19,7 +19,5 @@ wmtk_register_integration_test(
     EXEC_NAME convert_app
     CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/test_config.json
     CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/examples
-    GIT_REPOSITORY "https://github.com/wildmeshing/data.git"
-    GIT_TAG 363f8e860673a4e4f68df6465b99e86809c96283
     #EXTRA_ARGUMENTS run
 )
diff --git a/applications/delaunay/CMakeLists.txt b/applications/delaunay/CMakeLists.txt
@@ -18,5 +18,4 @@ wmtk::application_utils
 wmtk_register_integration_test(
     EXEC_NAME delaunay_app
     CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/delaunay_test_config.json
-    GIT_REPOSITORY "https://github.com/wildmeshing/data.git"
-    GIT_TAG 152a561697a6e923451ca8535309cbe1e116a9fa)
+)
diff --git a/applications/insertion/CMakeLists.txt b/applications/insertion/CMakeLists.txt
@@ -15,5 +15,4 @@ wmtk::output)
 wmtk_register_integration_test(
     EXEC_NAME insertion_app
     CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/insertion_test_config.json
-    GIT_REPOSITORY "https://github.com/wildmeshing/data.git"
-    GIT_TAG 3e2332c70755b4f9ad5b5ebdbbabeeb70ff20d28)
+)
diff --git a/applications/isotropic_remeshing/CMakeLists.txt b/applications/isotropic_remeshing/CMakeLists.txt
@@ -43,15 +43,11 @@ wmtk::application_utils
 wmtk_register_integration_test(
     EXEC_NAME isotropic_remeshing_3d_app
     CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/test_config_3d.json
-    GIT_REPOSITORY "https://github.com/wildmeshing/data.git"
-    GIT_TAG 152a561697a6e923451ca8535309cbe1e116a9fa
     CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 wmtk_register_integration_test(
     EXEC_NAME isotropic_remeshing_uv_app
     CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/test_config_uv.json
-    GIT_REPOSITORY "https://github.com/wildmeshing/data.git"
-    GIT_TAG 152a561697a6e923451ca8535309cbe1e116a9fa
     CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR}
 )
diff --git a/applications/longest_edge_split/CMakeLists.txt b/applications/longest_edge_split/CMakeLists.txt
@@ -16,5 +16,4 @@ nlohmann_json::nlohmann_json
 wmtk_register_integration_test(
     EXEC_NAME longest_edge_split_app
     CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/longest_edge_split_test_config.json
-    GIT_REPOSITORY "https://github.com/wildmeshing/data.git"
-    GIT_TAG 248a362798d5c181e00115256ae61c071bf7ce24)
+)
diff --git a/applications/marching/CMakeLists.txt b/applications/marching/CMakeLists.txt
@@ -16,5 +16,4 @@ nlohmann_json::nlohmann_json
 wmtk_register_integration_test(
     EXEC_NAME marching_app
     CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/marching_test_config.json
-    GIT_REPOSITORY "https://github.com/wildmeshing/data.git"
-    GIT_TAG 9014372217bb5170613ccdcec8759cf58583672c)
+)
diff --git a/applications/shortest_edge_collapse/CMakeLists.txt b/applications/shortest_edge_collapse/CMakeLists.txt
@@ -16,5 +16,4 @@ nlohmann_json::nlohmann_json
 wmtk_register_integration_test(
     EXEC_NAME shortest_edge_collapse_app
     CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/shortest_edge_collapse_test_config.json
-    GIT_REPOSITORY "https://github.com/wildmeshing/data.git"
-    GIT_TAG 23e95b46bacc9c962f6103f42f5f3e5da536942a)
+)
diff --git a/applications/tetwild_simplification/CMakeLists.txt b/applications/tetwild_simplification/CMakeLists.txt
@@ -15,5 +15,4 @@ wmtk::output)
 wmtk_register_integration_test(
     EXEC_NAME tw_simplification_app
     CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/tw_simplification_test_config.json
-    GIT_REPOSITORY "https://github.com/wildmeshing/data.git"
-    GIT_TAG 5a74c7ffda3bf1014875944f59e42a3db39775df)
+)
diff --git a/applications/triwild/CMakeLists.txt b/applications/triwild/CMakeLists.txt
@@ -15,5 +15,4 @@ wmtk::output)
 
 wmtk_register_integration_test(EXEC_NAME triwild_app
     CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/triwild_test_config.json
-    GIT_REPOSITORY "https://github.com/wildmeshing/data.git"
-    GIT_TAG 82ea9d55c901bbc86d48de39383e9c85d8f67686)
+)
diff --git a/cmake/recipes/tests/wmtk_data.cmake b/cmake/recipes/tests/wmtk_data.cmake
@@ -6,11 +6,8 @@ if(TARGET wmtk::data)
 endif()
 
 include(wmtk_download_data)
-wmtk_download_data(DATA_DIR 
-    https://github.com/wildmeshing/data.git
-    152a561697a6e923451ca8535309cbe1e116a9fa
-    )
+wmtk_download_data()
 
 add_library(wmtk_data INTERFACE)
 add_library(wmtk::data ALIAS wmtk_data)
-target_compile_definitions(wmtk_data INTERFACE WMTK_DATA_DIR=\"${DATA_DIR}\")
+target_compile_definitions(wmtk_data INTERFACE WMTK_DATA_DIR=\"${DATA_DIR}\")
diff --git a/cmake/wmtk_download_data.cmake b/cmake/wmtk_download_data.cmake
@@ -1,30 +1,16 @@
-function(wmtk_download_data DATA_DIR GIT_REPOSITORY GIT_TAG)
+function(wmtk_download_data)
 
-    string(MD5 REPO_HASH "${GIT_REPOSITORY}${GIT_TAG}")
 
-    SET(WMTK_DOWNLOAD_DATA_FOLDER ${WMTK_DATA_ROOT}/${REPO_HASH})
-    MESSAGE(STATUS "Download data to ${WMTK_DOWNLOAD_DATA_FOLDER} from GIT_REPOSITORY ${GIT_REPOSITORY} GIT_TAG ${GIT_TAG}")
 
-    include(FetchContent)
-    FetchContent_Populate(
-        wmtk_id
-        QUIET
-        GIT_REPOSITORY ${GIT_REPOSITORY}
-        GIT_TAG ${GIT_TAG}
-        SOURCE_DIR ${WMTK_DOWNLOAD_DATA_FOLDER}
-    )
-    set(DATA_DIR ${WMTK_DOWNLOAD_DATA_FOLDER} PARENT_SCOPE)
+     CPMAddPackage(
+         NAME wmtk_data
+         GIT_REPOSITORY ${WMTK_DATA_REPOSITORY}
+         GIT_TAG ${WMTK_DATA_TAG}
+         GIT_SHALLOW FALSE
+         DOWNLOAD_ONLY TRUE
+     )
 
-    # MESSAGE(STATUS "Download data to ${wmtk_itd_${REPO_HASH}_SRC} from GIT_REPOSITORY ${GIT_REPOSITORY} GIT_TAG ${GIT_TAG}")
-    #
-    # CPMAddPackage(
-    #     NAME wmtk_itd_${REPO_HASH}
-    #     GIT_REPOSITORY ${GIT_REPOSITORY}
-    #     GIT_TAG ${GIT_TAG}
-    #     GIT_SHALLOW TRUE
-    #     DOWNLOAD_ONLY TRUE
-    # )
-    # set(DATA_DIR "${wmtk_itd_${REPO_HASH}_SRC}" PARENT_SCOPE)
+     set(DATA_DIR "${wmtk_data_SOURCE_DIR}" PARENT_SCOPE)
 
 
-endfunction()
+endfunction()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Include Catch2 stuff
 
+enable_testing()
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/recipes/tests")
 
 include(catch2)

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,5 @@ wmtk_register_integration_test(`
`19`	`19`	`EXEC_NAME convert_app`
`20`	`20`	`CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/test_config.json`
`21`	`21`	`CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/examples`
`22`		`- GIT_REPOSITORY "https://github.com/wildmeshing/data.git"`
`23`		`- GIT_TAG 363f8e860673a4e4f68df6465b99e86809c96283`
`24`	`22`	`#EXTRA_ARGUMENTS run`
`25`	`23`	`)`