Merge pull request #82 from FeTS-AI/fets_2.0_master_sync

Fets 2.0 master sync
FeTS-AI · Feb 15, 2024 · 3df09a5 · 3df09a5
2 parents c58b76a + dd1dab9
commit 3df09a5
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 35 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -29,9 +29,9 @@ jobs:
     steps:
     - name: Check out the repository
       uses: actions/checkout@v3
-      # with:
+      with:
       #   lfs: false
-      #   submodules: 'recursive'
+        submodules: 'true'
 
     # - name: Check if the repository has changed
     #   run: ls -l
@@ -150,4 +150,3 @@ jobs:
     #  # This step uses the identity token to provision an ephemeral certificate
     #  # against the sigstore community Fulcio instance.
     #  run: cosign sign ghcr.io/fets-ai/front-end@${{ steps.upload.outputs.digest }}
-
diff --git a/data/Algorithms_for_fetsTool1.0.zip b/data/Algorithms_for_fetsTool1.0.zip
diff --git a/data/GANDLF_for_fetsTool1.0.zip b/data/GANDLF_for_fetsTool1.0.zip
diff --git a/src/applications/Utilities/CMakeLists.txt b/src/applications/Utilities/CMakeLists.txt
@@ -106,38 +106,37 @@ SET( DOWNLOADED_APPS_DIR ${PROJECT_BINARY_DIR}/hausdorff95 )
 
 IF( NOT EXISTS "${DOWNLOADED_APPS_DIR}" )
 
-  IF( NOT EXISTS "${FILE_TO_EXTRACT}" )
-
-    # do not re-download if the LFS fetch worked
-    IF(NOT EXISTS ${FILE_TO_EXTRACT})
-      # download exe from url
-      MESSAGE( STATUS "Downloading pre-compiled hausdorff" )
-      FILE(DOWNLOAD "${DOWNLOAD_LINK}" "${FILE_TO_EXTRACT}" TIMEOUT 1000000 STATUS STATUS_CODE SHOW_PROGRESS)
-      IF(NOT STATUS_CODE EQUAL 0)
-        SET( DOWNLOAD_LINK "https://github.com/CBICA/precompiledBinaries/raw/master/${PLATFORM_STRING}/Hausdorff95_${PLATFORM_STRING}.zip" )
-        FILE(DOWNLOAD "${DOWNLOAD_LINK}" "${FILE_TO_EXTRACT}" TIMEOUT 1000000 STATUS STATUS_CODE SHOW_PROGRESS)
-        IF(NOT STATUS_CODE EQUAL 0)
-          MESSAGE(FATAL_ERROR "Failed to download Precompiled hausdorff. Status=${STATUS_CODE}")
-        ENDIF()
-      ENDIF()
-    ENDIF()
-  ENDIF()
-
-  FILE(MAKE_DIRECTORY ${DOWNLOADED_APPS_DIR})
-
-  MESSAGE( STATUS "Extracting pre-compiled hausdorff" )
-  IF( EXISTS "${FILE_TO_EXTRACT}" )
-
-    EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E tar xfz ${FILE_TO_EXTRACT}
-      WORKING_DIRECTORY ${DOWNLOADED_APPS_DIR}
-      RESULT_VARIABLE RESULT_CODE
-    )
-
-    IF(NOT RESULT_CODE EQUAL 0)
-      MESSAGE( WARNING "Extracting the pre-compiled hausdorff failed" )
-    ENDIF()
-
-  ENDIF()
+#  IF( NOT EXISTS "${FILE_TO_EXTRACT}" )
+#    # do not re-download if the LFS fetch worked
+#    IF(NOT EXISTS ${FILE_TO_EXTRACT})
+#      # download exe from url
+#      MESSAGE( STATUS "Downloading pre-compiled hausdorff" )
+#      FILE(DOWNLOAD "${DOWNLOAD_LINK}" "${FILE_TO_EXTRACT}" TIMEOUT 1000000 STATUS STATUS_CODE SHOW_PROGRESS)
+#      IF(NOT STATUS_CODE EQUAL 0)
+#        SET( DOWNLOAD_LINK "https://github.com/CBICA/precompiledBinaries/raw/master/${PLATFORM_STRING}/Hausdorff95_${PLATFORM_STRING}.zip" )
+#        FILE(DOWNLOAD "${DOWNLOAD_LINK}" "${FILE_TO_EXTRACT}" TIMEOUT 1000000 STATUS STATUS_CODE SHOW_PROGRESS)
+#        IF(NOT STATUS_CODE EQUAL 0)
+#          MESSAGE(FATAL_ERROR "Failed to download Precompiled hausdorff. Status=${STATUS_CODE}")
+#        ENDIF()
+#      ENDIF()
+#    ENDIF()
+#  ENDIF()
+
+#  FILE(MAKE_DIRECTORY ${DOWNLOADED_APPS_DIR})
+
+#  MESSAGE( STATUS "Extracting pre-compiled hausdorff" )
+#  IF( EXISTS "${FILE_TO_EXTRACT}" )
+
+#    EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E tar xfz ${FILE_TO_EXTRACT}
+#      WORKING_DIRECTORY ${DOWNLOADED_APPS_DIR}
+#      RESULT_VARIABLE RESULT_CODE
+#    )
+
+#    IF(NOT RESULT_CODE EQUAL 0)
+#      MESSAGE( WARNING "Extracting the pre-compiled hausdorff failed" )
+#    ENDIF()
+
+#  ENDIF()
 ENDIF()
 
 FILE(GLOB HausdoffEXE "${DOWNLOADED_APPS_DIR}/*")