Merge branch 'master' into simgrid-external-project-ci

wrench-project · Oct 31, 2024 · 6221421 · 6221421
2 parents 2ce85bf + deb1d07
commit 6221421
Show file tree

Hide file tree

Showing 352 changed files with 5,660 additions and 8,024 deletions.
diff --git a/.clang-format b/.clang-format
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -1,15 +1,15 @@
 name: Build-macOS
 
 on:
-  push:
-    paths-ignore:
-      - 'doc/**'
-      - '**.md'
-  workflow_run:
-    workflows: ["clang-format"]
-    branches: [master]
-    types: 
-      - completed
+  #  push:
+  #  paths-ignore:
+  #    - 'doc/**'
+  #    - '**.md'
+  #workflow_run:
+  #  workflows: ["clang-format"]
+  #  branches: [master]
+  #  types: 
+  #    - completed
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -30,17 +30,12 @@ jobs:
       - name: Install gcc
         run: |
           brew install gcc
+      - name: debug0
+        run: |
+          ls /opt/homebrew/bin/
       - name: Install nlohmann-json
         run: |
           brew install nlohmann-json
-          #wget https://github.com/nlohmann/json/archive/refs/tags/v3.11.3.tar.gz
-          #tar -xzf v3.11.3.tar.gz
-          #cd json-3.11.3 
-          #mkdir build
-          #cd build
-          #cmake ..
-          #make -j4
-          #sudo make install
       - name: Install googletest
         run: |
           brew install googletest
@@ -53,7 +48,13 @@ jobs:
           wget --no-check-certificate https://framagit.org/simgrid/simgrid/-/archive/v3.36/simgrid-v3.36.tar.gz
           tar -xf simgrid-v3.36.tar.gz
           cd simgrid-v3.36
-          cmake .
+          sed -I ""  "s/gfortran/gfortran -L./" CMakeLists.txt
+          mkdir build
+          cd build
+          cmake -DCMAKE_CXX_COMPILER=/opt/homebrew/bin/g++-14 -DCMAKE_CXX_COMPILER=/opt/homebrew/bin/g++-14 ..
+          cp /opt/homebrew/lib/gcc/14/*libgfortran* .
+          ls
+          echo "DYLD_LIBRARY_PATH=$(echo $DYLD_LIBRARY_PATH:.)" >> $GITHUB_ENV
           make -j4
           sudo make install
       - name: Source Build and Test

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,31 +12,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  format:
-    name: "Code Formatting"
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: DoozyX/[email protected]
-        with:
-          source: '.'
-          exclude: './doc'
-          extensions: 'h,cpp'
-          clangFormatVersion: 13
-          inplace: True
-      - uses: EndBug/add-and-commit@v4
-        with:
-          message: 'Committing clang-format changes'
-        env:
-          GITHUB_TOKEN: ${{ secrets.TOKEN_GITHUB }}
-
   build:
     runs-on: ubuntu-latest
     if: ${{ always() }}
-    needs: format
-
     strategy:
       matrix:
         include:

diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,7 @@ cmake-build-debug
 cmake-build-release
 build
 .idea
+.clang-format
 
 # VSCode
 .vscode
@@ -57,8 +58,9 @@ examples/workflow_api/condor-grid-example/wrench-example-condor-grid-universe
 *wrench-example*
 examples/workflow_api/basic-examples/io-pagecache/wrench-example*
 
-# Generated REST API routes
+# Generated REST API routes and data structures
 tools/wrench/wrench-daemon/include/routes.h
+tools/wrench/wrench-daemon/include/callback-map.h
 
 #JSON
 host_utilization_layout.json

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.12)
 message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
 
 project(wrench CXX)
@@ -7,6 +7,8 @@ project(wrench CXX)
 add_definitions("-DBOOST_ALLOW_DEPRECATED_HEADERS")
 #add_definitions("-DBOOST_BIND_GLOBAL_PLACEHOLDERS")
 
+
+
 # Make Release the default build type
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
@@ -25,7 +27,6 @@ if (ENABLE_WRENCH_INTERNAL_EXCEPTIONS)
 endif ()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/conf/cmake/")
-message("CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}")
 
 # Find Boost
 find_package(Boost REQUIRED)
@@ -48,14 +49,32 @@ if (DEFINED SimGrid_PATH)
 endif()
 find_package(SimGrid REQUIRED)
 
+# Find SimGrid's FS module
+if (DEFINED FSMOD_PATH)
+    if (NOT EXISTS "${FSMOD_PATH}")
+        message(FATAL_ERROR "The specified FSMOD_PATH doesn't exit")
+    else()
+        file(GLOB LIBFSMOD_FILES
+                "${FSMOD_PATH}/liblibfsmod.so"
+                "${FSMOD_PATH}/lib/libfsmod.dylib"
+                )
+        if (NOT LIBFSMOD_FILES)
+            message(FATAL_ERROR "The specified FSMOD_PATH doesn't seem to contain a valid FSMod installation")
+        else()
+            set(CMAKE_PREFIX_PATH ${FSMOD_PATH} ${CMAKE_PREFIX_PATH})
+        endif()
+    endif()
+endif()
+find_package(FSMod REQUIRED)
+
 # Find nlohmann_json
 find_package(nlohmann_json)
 
 set(CMAKE_CXX_STANDARD 17)
 
 # build the version number
 set(WRENCH_VERSION_MAJOR "2")
-set(WRENCH_VERSION_MINOR "4")
+set(WRENCH_VERSION_MINOR "5")
 set(WRENCH_VERSION_PATCH "0")
 set(WRENCH_VERSION_EXTRA "dev")
 
@@ -71,7 +90,7 @@ endif ()
 
 message(STATUS "Building WRENCH Version: ${WRENCH_RELEASE_VERSION}")
 
-include_directories(src/wrench/ include/ ${SimGrid_INCLUDE_DIR} ${Boost_INCLUDE_DIR} /usr/include /usr/local/include /opt/local/include)
+include_directories(src/wrench/ include/ ${SimGrid_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${FSMOD_INCLUDE_DIR} /usr/include /usr/local/include /opt/local/include)
 
 
 # For MacOS's MacPorts
@@ -247,7 +266,6 @@ set(SOURCE_FILES
         include/wrench/services/compute/batch/batch_schedulers/BatchScheduler.h
         include/wrench/services/compute/batch/batch_schedulers/homegrown/HomegrownBatchScheduler.h
         include/wrench/services/storage/storage_helpers/FileTransferThread.h
-        include/wrench/services/storage/storage_helpers/LogicalFileSystem.h
         include/wrench/services/storage/storage_helpers/LogicalFileSystemNoCaching.h
         include/wrench/services/storage/storage_helpers/LogicalFileSystemLRUCaching.h
         src/wrench/logging/TerminalOutput.cpp
@@ -353,9 +371,6 @@ set(SOURCE_FILES
         src/wrench/services/storage/storage_helper_classes/FileLocation.cpp
         src/wrench/services/storage/storage_helper_classes/FileTransferThread.cpp
         include/wrench/services/storage/storage_helpers/FileTransferThreadMessage.h
-        src/wrench/services/storage/storage_helper_classes/LogicalFileSystem.cpp
-        src/wrench/services/storage/storage_helper_classes/LogicalFileSystemNoCaching.cpp
-        src/wrench/services/storage/storage_helper_classes/LogicalFileSystemLRUCaching.cpp
         src/wrench/simgrid_S4U_util/S4U_Daemon.cpp
         src/wrench/simgrid_S4U_util/S4U_DaemonActor.cpp
         include/wrench/simgrid_S4U_util/S4U_DaemonActor.h
@@ -480,6 +495,7 @@ set(TEST_FILES
         test/services/compute_services/batch_standard_and_pilot_jobs/BatchServiceOutputCSVFileTest.cpp
         test/services/compute_services/batch_standard_and_pilot_jobs/BatchServiceBatschedQueueWaitTimePredictionTest.cpp
         test/services/compute_services/batch_standard_and_pilot_jobs/BatchServiceBatschedContiguityTest.cpp
+        test/services/compute_services/batch_standard_and_pilot_jobs/BatchServiceResourceInformationTest.cpp
         test/services/helper_services/HostStateChangeTest.cpp
         test/services/helper_services/AlarmTest.cpp
         test/services/storage_services/XRootDStorageService/XRootDStorageServiceBasicFunctionalTest.cpp
@@ -553,7 +569,7 @@ set(TEST_FILES
 
 add_library(wrench STATIC ${SOURCE_FILES})
 set_target_properties(wrench PROPERTIES VERSION ${WRENCH_RELEASE_VERSION})
-target_link_libraries(wrench ${SimGrid_LIBRARY})
+target_link_libraries(wrench ${SimGrid_LIBRARY} ${FSMOD_LIBRARY})
 
 # wrench version
 add_custom_command(TARGET wrench PRE_LINK COMMAND ${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DWRENCH_RELEASE_VERSION=${WRENCH_RELEASE_VERSION} -P ${CMAKE_HOME_DIRECTORY}/conf/cmake/Version.cmake)

diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
 [![Build Status][build-badge]][build-link]
-[![Build-macOS Status][build-macos-badge]][build-macos-link]
 [![GitHub Release][release-badge]][release-link]
 [![License: LGPL v3][license-badge]](LICENSE.md)
 [![Coverage Status][codecov-badge]][codecov-link]
@@ -43,6 +42,7 @@ And, one of the following:
 ### Required Dependencies 
 
 - [SimGrid](https://framagit.org/simgrid/simgrid/) - version 3.36
+- [SimGrid File System Module](https://github.com/simgrid/file-system-module) - version 0.2 or higher
 - [JSON for Modern C++](https://github.com/nlohmann/json) - version 3.11.0 or higher 
 
 ### Optional Dependencies

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -3,7 +3,16 @@ WRENCH Release Notes
 
 ### current master branch
 
-Nothing new yet
+Nothing here yet
+
+### wrench 2.4
+
+- Removal of all file system simulation code, which was replaced by calls to
+  the [SimGrid File System Module (FSMod)](https://github.com/simgrid/file-system-module), which is now a new
+  software dependency for WRENCH
+- API change: all numbers of bytes (file and memory sizes) are now of type `sg_size_t` instead of `double` (due to the use of FSMod above)
+- Added REST API functionality and updated all documentation
+- Minor code/documentation cleanups
 
 ### wrench 2.3