From bbcb8a5980b09408f757180c0d739c35da2fb85f Mon Sep 17 00:00:00 2001 From: Marc Vef Date: Sun, 9 Jun 2024 11:12:23 +0200 Subject: [PATCH 1/9] Updating all dependencies for v0.9.3 --- scripts/profiles/0.9.3/agios.specs | 14 ++-- scripts/profiles/0.9.3/all.specs | 18 ++--- scripts/profiles/0.9.3/arm.specs | 16 ++-- scripts/profiles/0.9.3/ci.specs | 10 +-- scripts/profiles/0.9.3/default.specs | 16 ++-- scripts/profiles/0.9.3/infiniband_verbs.specs | 14 ++-- scripts/profiles/0.9.3/install/agios.install | 4 +- .../profiles/0.9.3/install/argobots.install | 4 +- .../profiles/0.9.3/install/capstone.install | 4 +- scripts/profiles/0.9.3/install/curl.install | 4 +- scripts/profiles/0.9.3/install/json-c.install | 4 +- .../0.9.3/install/libfabric%verbs.install | 4 +- .../profiles/0.9.3/install/libfabric.install | 4 +- scripts/profiles/0.9.3/install/lz4.install | 4 +- scripts/profiles/0.9.3/install/margo.install | 4 +- .../profiles/0.9.3/install/mercury.install | 4 +- .../profiles/0.9.3/install/parallax.install | 4 +- .../0.9.3/install/prometheus-cpp.install | 4 +- .../profiles/0.9.3/install/rocksdb.install | 4 +- .../0.9.3/install/syscall_intercept.install | 4 +- .../{direct.specs => install/ucx.install} | 81 ++++++++----------- scripts/profiles/0.9.3/marenostrum4.specs | 17 ++-- scripts/profiles/0.9.3/mogon2.specs | 22 ++--- scripts/profiles/0.9.3/ngio.specs | 17 ++-- scripts/profiles/0.9.3/omnipath_psm2.specs | 17 ++-- scripts/profiles/0.9.3/p9.specs | 17 ++-- scripts/profiles/sources.list | 3 +- src/daemon/handler/srv_management.cpp | 5 +- tests/scripts/dl_dep.sh/0.8.0/default.out | 2 +- tests/scripts/dl_dep.sh/0.8.0/mogon2.out | 2 +- tests/scripts/dl_dep.sh/0.8.0/ngio.out | 2 +- .../scripts/dl_dep.sh/0.9.0/marenostrum4.out | 2 +- tests/scripts/dl_dep.sh/0.9.0/mogon2.out | 2 +- tests/scripts/dl_dep.sh/0.9.0/ngio.out | 2 +- .../scripts/dl_dep.sh/0.9.0/omnipath_psm2.out | 2 +- tests/scripts/dl_dep.sh/0.9.1/all.out | 2 +- .../scripts/dl_dep.sh/0.9.1/marenostrum4.out | 2 +- tests/scripts/dl_dep.sh/0.9.1/mogon2.out | 2 +- tests/scripts/dl_dep.sh/0.9.1/ngio.out | 2 +- .../scripts/dl_dep.sh/0.9.1/omnipath_psm2.out | 2 +- tests/scripts/dl_dep.sh/0.9.1/p9.out | 2 +- tests/scripts/dl_dep.sh/0.9.2/all.out | 2 +- tests/scripts/dl_dep.sh/0.9.2/arm.out | 2 +- .../scripts/dl_dep.sh/0.9.2/marenostrum4.out | 2 +- tests/scripts/dl_dep.sh/0.9.2/mogon2.out | 2 +- tests/scripts/dl_dep.sh/0.9.2/ngio.out | 2 +- .../scripts/dl_dep.sh/0.9.2/omnipath_psm2.out | 2 +- tests/scripts/dl_dep.sh/0.9.2/p9.out | 2 +- 48 files changed, 178 insertions(+), 185 deletions(-) rename scripts/profiles/0.9.3/{direct.specs => install/ucx.install} (58%) diff --git a/scripts/profiles/0.9.3/agios.specs b/scripts/profiles/0.9.3/agios.specs index 2d40731d9..68921e298 100644 --- a/scripts/profiles/0.9.3/agios.specs +++ b/scripts/profiles/0.9.3/agios.specs @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # @@ -37,18 +37,18 @@ comment="All dependencies (except transport-specific and experimental)" # Dependencies that must be downloaded directly wgetdeps=( - ["lz4"]="1.9.3" + ["lz4"]="1.9.4" ["capstone"]="4.0.2" ["argobots"]="1.1" ["rocksdb"]="8.10.0" - ["json-c"]="0.15-20200726" + ["json-c"]="0.17-20230812" ) # Dependencies that must be cloned clonedeps=( - ["libfabric"]="HEAD@v1.13.2" - ["mercury"]="v2.1.0" - ["margo"]="v0.9.6" + ["libfabric"]="HEAD@v1.20.1" + ["mercury"]="v2.3.1" + ["margo"]="v0.15.0" ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d" ["agios"]="c26a6544200f823ebb8f890dd94e653d148bf226@development" ) diff --git a/scripts/profiles/0.9.3/all.specs b/scripts/profiles/0.9.3/all.specs index fffb4c14b..67396b8dc 100644 --- a/scripts/profiles/0.9.3/all.specs +++ b/scripts/profiles/0.9.3/all.specs @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # @@ -37,21 +37,21 @@ comment="Dependencies for Mogon 2 supercomputer" # Dependencies that must be downloaded directly wgetdeps=( - ["lz4"]="1.9.3" + ["lz4"]="1.9.4" ["capstone"]="4.0.2" ["argobots"]="1.1" ["rocksdb"]="8.10.0" ["psm2"]="11.2.185" - ["json-c"]="0.15-20200726" - ["curl"]="7.82.0" + ["json-c"]="0.17-20230812" + ["curl"]="7.88.1" ["prometheus-cpp"]="v1.0.0" ) # Dependencies that must be cloned clonedeps=( - ["libfabric"]="HEAD@v1.13.2" - ["mercury"]="v2.1.0" - ["margo"]="v0.9.6" + ["libfabric"]="HEAD@v1.20.1" + ["mercury"]="v2.3.1" + ["margo"]="v0.15.0" ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d" ["agios"]="c26a6544200f823ebb8f890dd94e653d148bf226@development" ["parallax"]="ffdea6e820f5c4c2d33e60d9a4b15ef9e6bbcfdd" @@ -69,7 +69,7 @@ clonedeps_patches=( # Ordering that MUST be followed when downloading order=( - "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" + "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "agios" "curl" "prometheus-cpp" "parallax" ) diff --git a/scripts/profiles/0.9.3/arm.specs b/scripts/profiles/0.9.3/arm.specs index 3e5c5f893..1d5432de8 100644 --- a/scripts/profiles/0.9.3/arm.specs +++ b/scripts/profiles/0.9.3/arm.specs @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # @@ -37,19 +37,19 @@ comment="Dependencies for PowerPC supercomputer" # Dependencies that must be downloaded directly wgetdeps=( - ["lz4"]="1.9.3" + ["lz4"]="1.9.4" ["capstone"]="4.0.2" ["argobots"]="1.1" ["rocksdb"]="8.10.0" + ["json-c"]="0.17-20230812" ["psm2"]="11.2.185" - ["json-c"]="0.15-20200726" ) # Dependencies that must be cloned clonedeps=( - ["libfabric"]="HEAD@v1.13.2" - ["mercury"]="v2.1.0" - ["margo"]="v0.9.6" + ["libfabric"]="HEAD@v1.20.1" + ["mercury"]="v2.3.1" + ["margo"]="v0.15.0" ["syscall_intercept"]="fb73c3924b502e2840a5dc8a18746e395b06a8a6" ) @@ -65,7 +65,7 @@ clonedeps_patches=( # Ordering that MUST be followed when downloading order=( - "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" + "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" ) # Extra arguments passed to the installation script. As such, they can diff --git a/scripts/profiles/0.9.3/ci.specs b/scripts/profiles/0.9.3/ci.specs index deafa628e..42d3dbc23 100644 --- a/scripts/profiles/0.9.3/ci.specs +++ b/scripts/profiles/0.9.3/ci.specs @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # @@ -44,9 +44,9 @@ wgetdeps=( # Dependencies that must be cloned clonedeps=( - ["libfabric"]="HEAD@v1.13.2" - ["mercury"]="v2.1.0" - ["margo"]="v0.9.6" + ["libfabric"]="HEAD@v1.17.0" + ["mercury"]="v2.3.1" + ["margo"]="v0.15.0" ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d" ["agios"]="c26a6544200f823ebb8f890dd94e653d148bf226@development" ["parallax"]="ffdea6e820f5c4c2d33e60d9a4b15ef9e6bbcfdd" diff --git a/scripts/profiles/0.9.3/default.specs b/scripts/profiles/0.9.3/default.specs index 838c98145..59d8175fe 100644 --- a/scripts/profiles/0.9.3/default.specs +++ b/scripts/profiles/0.9.3/default.specs @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # @@ -37,18 +37,18 @@ comment="All dependencies" # Dependencies that must be downloaded directly wgetdeps=( - ["lz4"]="1.9.3" + ["lz4"]="1.9.4" ["capstone"]="4.0.2" ["argobots"]="1.1" ["rocksdb"]="8.10.0" - ["json-c"]="0.15-20200726" + ["json-c"]="0.17-20230812" ) -# Dependencies that must be cloned +# Dependencies that must be cloned. clonedeps=( - ["libfabric"]="HEAD@v1.13.2" - ["mercury"]="v2.1.0" - ["margo"]="v0.9.6" + ["libfabric"]="HEAD@v1.20.1" + ["mercury"]="v2.3.1" + ["margo"]="v0.15.0" ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d" ) diff --git a/scripts/profiles/0.9.3/infiniband_verbs.specs b/scripts/profiles/0.9.3/infiniband_verbs.specs index 0d6f865e4..c5ddd41c8 100644 --- a/scripts/profiles/0.9.3/infiniband_verbs.specs +++ b/scripts/profiles/0.9.3/infiniband_verbs.specs @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # @@ -37,18 +37,18 @@ comment="Dependencies for Infiniband supercomputer" # Dependencies that must be downloaded directly wgetdeps=( - ["lz4"]="1.9.3" + ["lz4"]="1.9.4" ["capstone"]="4.0.2" ["argobots"]="1.1" ["rocksdb"]="8.10.0" - ["json-c"]="0.15-20200726" + ["json-c"]="0.17-20230812" ) # Dependencies that must be cloned clonedeps=( - ["libfabric%verbs"]="HEAD@v1.13.2" - ["mercury"]="v2.1.0" - ["margo"]="v0.9.6" + ["libfabric%verbs"]="HEAD@v1.17.0" + ["mercury"]="v2.3.0" + ["margo"]="v0.14.1" ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d" ) diff --git a/scripts/profiles/0.9.3/install/agios.install b/scripts/profiles/0.9.3/install/agios.install index 3d0392ff5..b5ed7d7ee 100644 --- a/scripts/profiles/0.9.3/install/agios.install +++ b/scripts/profiles/0.9.3/install/agios.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # diff --git a/scripts/profiles/0.9.3/install/argobots.install b/scripts/profiles/0.9.3/install/argobots.install index 96ccea920..9ff03b5a0 100644 --- a/scripts/profiles/0.9.3/install/argobots.install +++ b/scripts/profiles/0.9.3/install/argobots.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # diff --git a/scripts/profiles/0.9.3/install/capstone.install b/scripts/profiles/0.9.3/install/capstone.install index ff299d82b..afd7794af 100644 --- a/scripts/profiles/0.9.3/install/capstone.install +++ b/scripts/profiles/0.9.3/install/capstone.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # diff --git a/scripts/profiles/0.9.3/install/curl.install b/scripts/profiles/0.9.3/install/curl.install index d873819c4..44fab7ce9 100644 --- a/scripts/profiles/0.9.3/install/curl.install +++ b/scripts/profiles/0.9.3/install/curl.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # diff --git a/scripts/profiles/0.9.3/install/json-c.install b/scripts/profiles/0.9.3/install/json-c.install index 7280cda81..9ba99fed6 100644 --- a/scripts/profiles/0.9.3/install/json-c.install +++ b/scripts/profiles/0.9.3/install/json-c.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # diff --git a/scripts/profiles/0.9.3/install/libfabric%verbs.install b/scripts/profiles/0.9.3/install/libfabric%verbs.install index 15257eb81..74a192102 100644 --- a/scripts/profiles/0.9.3/install/libfabric%verbs.install +++ b/scripts/profiles/0.9.3/install/libfabric%verbs.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # diff --git a/scripts/profiles/0.9.3/install/libfabric.install b/scripts/profiles/0.9.3/install/libfabric.install index 7db89438e..6fee0bf9e 100644 --- a/scripts/profiles/0.9.3/install/libfabric.install +++ b/scripts/profiles/0.9.3/install/libfabric.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # diff --git a/scripts/profiles/0.9.3/install/lz4.install b/scripts/profiles/0.9.3/install/lz4.install index 13e4e53b3..893a1b13b 100644 --- a/scripts/profiles/0.9.3/install/lz4.install +++ b/scripts/profiles/0.9.3/install/lz4.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # diff --git a/scripts/profiles/0.9.3/install/margo.install b/scripts/profiles/0.9.3/install/margo.install index d2c6e4b5f..014621c68 100644 --- a/scripts/profiles/0.9.3/install/margo.install +++ b/scripts/profiles/0.9.3/install/margo.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # diff --git a/scripts/profiles/0.9.3/install/mercury.install b/scripts/profiles/0.9.3/install/mercury.install index 601305b83..e2f79ebc0 100644 --- a/scripts/profiles/0.9.3/install/mercury.install +++ b/scripts/profiles/0.9.3/install/mercury.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # diff --git a/scripts/profiles/0.9.3/install/parallax.install b/scripts/profiles/0.9.3/install/parallax.install index 38bd9c689..8c0cc9e95 100644 --- a/scripts/profiles/0.9.3/install/parallax.install +++ b/scripts/profiles/0.9.3/install/parallax.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # diff --git a/scripts/profiles/0.9.3/install/prometheus-cpp.install b/scripts/profiles/0.9.3/install/prometheus-cpp.install index 62e420217..154db65df 100644 --- a/scripts/profiles/0.9.3/install/prometheus-cpp.install +++ b/scripts/profiles/0.9.3/install/prometheus-cpp.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # diff --git a/scripts/profiles/0.9.3/install/rocksdb.install b/scripts/profiles/0.9.3/install/rocksdb.install index 6ece050bd..7c3004fee 100644 --- a/scripts/profiles/0.9.3/install/rocksdb.install +++ b/scripts/profiles/0.9.3/install/rocksdb.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # diff --git a/scripts/profiles/0.9.3/install/syscall_intercept.install b/scripts/profiles/0.9.3/install/syscall_intercept.install index 5c862dcb7..f69393d3a 100644 --- a/scripts/profiles/0.9.3/install/syscall_intercept.install +++ b/scripts/profiles/0.9.3/install/syscall_intercept.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # diff --git a/scripts/profiles/0.9.3/direct.specs b/scripts/profiles/0.9.3/install/ucx.install similarity index 58% rename from scripts/profiles/0.9.3/direct.specs rename to scripts/profiles/0.9.3/install/ucx.install index 90f4506ef..fd90d6d3f 100644 --- a/scripts/profiles/0.9.3/direct.specs +++ b/scripts/profiles/0.9.3/install/ucx.install @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # @@ -25,52 +25,37 @@ # # # SPDX-License-Identifier: GPL-3.0-or-later # ################################################################################ - # vi: ft=bash -# Variables to be imported into the scripts -declare -A wgetdeps clonedeps clonedeps_args clonedeps_patches extra_install_args -declare -a order - -# Comment that should be displayed when printing the profile -comment="Direct dependencies" - -# Dependencies that must be downloaded directly -wgetdeps=( - ["argobots"]="1.1" - ["rocksdb"]="8.10.0" -) - -# Dependencies that must be cloned -clonedeps=( - ["libfabric"]="HEAD@v1.13.2" - ["mercury"]="v2.1.0" - ["margo"]="v0.9.6" - ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d" -) - -# Extra arguments for git clone -clonedeps_args=( - ["mercury"]="--recurse-submodules" -) - -# Patches that should be applied post-clone -clonedeps_patches=( - ["syscall_intercept"]="syscall_intercept.patch" -) - -# Ordering that MUST be followed when downloading -order=( - "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" -) +################################################################################ +## The installation script must define both a pkg_install function and +## pkg_check function that, as their name implies, must specify how +## a dependency package should be installed and tested. ## ## The following +## variables can be used in the installation script: +## - CMAKE: a variable that expands to the cmake binary +## - SOURCE_DIR: the directory where the sources for the package were +## downloaded +## - INSTALL_DIR: the directory where the package should be installed +## - CORES: the number of cores to use when building +## - COMPILER_NAME: the name of the compiler being used (e.g. g++, clang, etc.) +## - COMPILER_FULL_VERSION: the compiler's full version (e.g. 9.3.0) +## - COMPILER_MAJOR_VERSION: the compiler's major version (e.g. 9) +## - PERFORM_TEST: whether tests for the package should be executed +################################################################################ -# Extra arguments passed to the installation script. As such, they can -# reference the following variables: -# - CMAKE: a variable that expands to the cmake binary -# - SOURCE_DIR: the directory where the sources for the package were -# downloaded -# - INSTALL_DIR: the directory where the package should be installed -# - CORES: the number of cores to use when building -# - PERFORM_TEST: whether tests for the package should be executed -extra_install_args=( -) +pkg_install() { + + ID="ucx" + CURR="${SOURCE_DIR}/${ID}" + prepare_build_dir "${CURR}" + cd "${CURR}" + ./autogen.sh + cd "${CURR}/build" + ../contrib/configure-release --prefix=${INSTALL_DIR} + make -j"${CORES}" + make install +} + +pkg_check() { + : +} diff --git a/scripts/profiles/0.9.3/marenostrum4.specs b/scripts/profiles/0.9.3/marenostrum4.specs index 793a5de9d..86f7dba1c 100644 --- a/scripts/profiles/0.9.3/marenostrum4.specs +++ b/scripts/profiles/0.9.3/marenostrum4.specs @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # @@ -37,20 +37,21 @@ comment="Dependencies for Marenostrum 4 supercomputer" # Dependencies that must be downloaded directly wgetdeps=( - ["lz4"]="1.9.3" + ["lz4"]="1.9.4" ["capstone"]="4.0.2" ["argobots"]="1.1" ["rocksdb"]="8.10.0" + ["json-c"]="0.17-20230812" ["psm2"]="11.2.185" - ["json-c"]="0.15-20200726" ) # Dependencies that must be cloned clonedeps=( - ["libfabric"]="HEAD@v1.13.2" - ["mercury"]="v2.1.0" - ["margo"]="v0.9.6" + ["libfabric"]="HEAD@v1.17.0" + ["mercury"]="v2.3.1" + ["margo"]="v0.15.0" ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d" + ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155" ["parallax"]="c130decd7a71c60c20b98d6a23924f05f754c3cd" ) @@ -66,7 +67,7 @@ clonedeps_patches=( # Ordering that MUST be followed when downloading order=( - "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "parallax" + "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" "parallax" ) # Extra arguments passed to the installation script. As such, they can diff --git a/scripts/profiles/0.9.3/mogon2.specs b/scripts/profiles/0.9.3/mogon2.specs index 83b2242fb..5ac17de8a 100644 --- a/scripts/profiles/0.9.3/mogon2.specs +++ b/scripts/profiles/0.9.3/mogon2.specs @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # @@ -37,21 +37,22 @@ comment="Dependencies for Mogon 2 supercomputer" # Dependencies that must be downloaded directly wgetdeps=( - ["lz4"]="1.9.3" + ["lz4"]="1.9.4" ["capstone"]="4.0.2" ["argobots"]="1.1" ["rocksdb"]="8.10.0" ["psm2"]="11.2.185" - ["json-c"]="0.15-20200726" + ["json-c"]="0.17-20230812" ) # Dependencies that must be cloned clonedeps=( - ["libfabric"]="HEAD@v1.13.2" - ["mercury"]="v2.1.0" - ["margo"]="v0.9.6" + ["libfabric"]="HEAD@v1.20.1" + ["mercury"]="v2.3.1" + ["margo"]="v0.15.0" ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d" - ["parallax"]="c130decd7a71c60c20b98d6a23924f05f754c3cd" + ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155" +# ["parallax"]="c130decd7a71c60c20b98d6a23924f05f754c3cd" ) # Extra arguments for git clone @@ -66,7 +67,7 @@ clonedeps_patches=( # Ordering that MUST be followed when downloading order=( - "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "parallax" + "lz4" "capstone" "json-c" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" ) # Extra arguments passed to the installation script. As such, they can @@ -78,5 +79,6 @@ order=( # - CORES: the number of cores to use when building # - PERFORM_TEST: whether tests for the package should be executed extra_install_args=( - ["libfabric"]="--enable-psm2=yes --with-psm2-src=${SOURCE_DIR}/psm2" + ["libfabric"]="--enable-psm2=yes --enable-opx=yes" +# ["libfabric"]="--enable-psm2=yes --with-psm2-src=${SOURCE_DIR}/psm2" ) diff --git a/scripts/profiles/0.9.3/ngio.specs b/scripts/profiles/0.9.3/ngio.specs index ef8875716..fd1f3a335 100644 --- a/scripts/profiles/0.9.3/ngio.specs +++ b/scripts/profiles/0.9.3/ngio.specs @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # @@ -37,20 +37,21 @@ comment="Dependencies for NEXTGenIO prototype cluster" # Dependencies that must be downloaded directly wgetdeps=( - ["lz4"]="1.9.3" + ["lz4"]="1.9.4" ["capstone"]="4.0.2" ["argobots"]="1.1" ["rocksdb"]="8.10.0" + ["json-c"]="0.17-20230812" ["psm2"]="11.2.185" - ["json-c"]="0.15-20200726" ) # Dependencies that must be cloned clonedeps=( - ["libfabric"]="HEAD@v1.13.2" - ["mercury"]="v2.1.0" - ["margo"]="v0.9.6" + ["libfabric"]="HEAD@v1.20.1" + ["mercury"]="v2.3.1" + ["margo"]="v0.15.0" ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d" + ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155" ["parallax"]="c130decd7a71c60c20b98d6a23924f05f754c3cd" ) @@ -66,7 +67,7 @@ clonedeps_patches=( # Ordering that MUST be followed when downloading order=( - "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "parallax" + "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" "parallax" ) # Extra arguments passed to the installation script. As such, they can diff --git a/scripts/profiles/0.9.3/omnipath_psm2.specs b/scripts/profiles/0.9.3/omnipath_psm2.specs index 9d18f59b3..8cdac16d8 100644 --- a/scripts/profiles/0.9.3/omnipath_psm2.specs +++ b/scripts/profiles/0.9.3/omnipath_psm2.specs @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # @@ -37,20 +37,21 @@ comment="Dependencies for Omnipath supercomputer" # Dependencies that must be downloaded directly wgetdeps=( - ["lz4"]="1.9.3" + ["lz4"]="1.9.4" ["capstone"]="4.0.2" ["argobots"]="1.1" ["rocksdb"]="8.10.0" + ["json-c"]="0.17-20230812" ["psm2"]="11.2.185" - ["json-c"]="0.15-20200726" ) # Dependencies that must be cloned clonedeps=( - ["libfabric"]="HEAD@v1.13.2" - ["mercury"]="v2.1.0" - ["margo"]="v0.9.6" + ["libfabric"]="HEAD@v1.20.1" + ["mercury"]="v2.3.1" + ["margo"]="v0.15.0" ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d" + ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155" ) # Extra arguments for git clone @@ -65,7 +66,7 @@ clonedeps_patches=( # Ordering that MUST be followed when downloading order=( - "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" + "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" ) # Extra arguments passed to the installation script. As such, they can diff --git a/scripts/profiles/0.9.3/p9.specs b/scripts/profiles/0.9.3/p9.specs index 8dff909a8..cf80be5a9 100644 --- a/scripts/profiles/0.9.3/p9.specs +++ b/scripts/profiles/0.9.3/p9.specs @@ -1,6 +1,6 @@ ################################################################################ -# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany # +# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # +# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # # # # This software was partially supported by the # # EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # @@ -37,20 +37,21 @@ comment="Dependencies for PowerPC supercomputer" # Dependencies that must be downloaded directly wgetdeps=( - ["lz4"]="1.9.3" + ["lz4"]="1.9.4" ["capstone"]="4.0.2" ["argobots"]="1.1" ["rocksdb"]="8.10.0" + ["json-c"]="0.17-20230812" ["psm2"]="11.2.185" - ["json-c"]="0.15-20200726" ) # Dependencies that must be cloned clonedeps=( - ["libfabric"]="HEAD@v1.13.2" - ["mercury"]="v2.1.0" - ["margo"]="v0.9.6" + ["libfabric"]="HEAD@v1.20.1" + ["mercury"]="v2.3.1" + ["margo"]="v0.15.0" ["syscall_intercept"]="6eb27a9d2053bb2ac3bb9ce30e13b64ce055c19f" + ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155" ) # Extra arguments for git clone @@ -65,7 +66,7 @@ clonedeps_patches=( # Ordering that MUST be followed when downloading order=( - "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" + "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" ) # Extra arguments passed to the installation script. As such, they can diff --git a/scripts/profiles/sources.list b/scripts/profiles/sources.list index b659f38fb..eec3277d6 100644 --- a/scripts/profiles/sources.list +++ b/scripts/profiles/sources.list @@ -39,7 +39,7 @@ sources=( ["argobots"]="https://github.com/pmodels/argobots/archive/v{{VERSION}}.tar.gz" ["rocksdb"]="https://github.com/facebook/rocksdb/archive/v{{VERSION}}.tar.gz" ["rocksdb%experimental"]="https://github.com/facebook/rocksdb/archive/v{{VERSION}}.tar.gz" - ["psm2"]="https://github.com/intel/opa-psm2/archive/PSM2_{{VERSION}}.tar.gz" + ["psm2"]="https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_{{VERSION}}.tar.gz" ["bmi"]="https://github.com/radix-io/bmi/" ["libfabric"]="https://github.com/ofiwg/libfabric.git" ["libfabric%experimental"]="https://github.com/ofiwg/libfabric.git" @@ -53,6 +53,7 @@ sources=( ["parallax"]="https://github.com/CARV-ICS-FORTH/parallax.git" ["prometheus-cpp"]="https://github.com/jupp0r/prometheus-cpp/releases/download/{{VERSION}}/prometheus-cpp-with-submodules.tar.gz" ["curl"]="https://curl.se/download/curl-{{VERSION}}.tar.gz" + ["ucx"]="https://github.com/openucx/ucx/archive/{{VERSION}}.tar.gz" ) diff --git a/src/daemon/handler/srv_management.cpp b/src/daemon/handler/srv_management.cpp index 585646aed..ef5f8735d 100644 --- a/src/daemon/handler/srv_management.cpp +++ b/src/daemon/handler/srv_management.cpp @@ -72,8 +72,9 @@ rpc_srv_get_fs_config(hg_handle_t handle) { out.blocks_state = static_cast(GKFS_DATA->blocks_state()); out.uid = getuid(); out.gid = getgid(); - GKFS_DATA->spdlogger()->debug("{}() Sending output configs back to library", - __func__); + GKFS_DATA->spdlogger()->debug( + "{}() Sending output configs back to library. mountdir '{}' rootdir '{}'", + __func__, out.mountdir, out.rootdir); auto hret = margo_respond(handle, &out); if(hret != HG_SUCCESS) { GKFS_DATA->spdlogger()->error( diff --git a/tests/scripts/dl_dep.sh/0.8.0/default.out b/tests/scripts/dl_dep.sh/0.8.0/default.out index 7ba8e6778..8369fe839 100644 --- a/tests/scripts/dl_dep.sh/0.8.0/default.out +++ b/tests/scripts/dl_dep.sh/0.8.0/default.out @@ -12,5 +12,5 @@ Downloaded 'https://github.com/facebook/rocksdb/archive/v6.2.2.tar.gz' to 'rocks Downloaded 'https://github.com/facebook/rocksdb/archive/v6.11.4.tar.gz' to 'rocksdb%experimental' Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags '' Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags '' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.86.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.86.tar.gz' to 'psm2' Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development' diff --git a/tests/scripts/dl_dep.sh/0.8.0/mogon2.out b/tests/scripts/dl_dep.sh/0.8.0/mogon2.out index d8af0a79b..d5844433b 100644 --- a/tests/scripts/dl_dep.sh/0.8.0/mogon2.out +++ b/tests/scripts/dl_dep.sh/0.8.0/mogon2.out @@ -10,4 +10,4 @@ Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.6. Downloaded 'https://github.com/facebook/rocksdb/archive/v6.11.4.tar.gz' to 'rocksdb%experimental' Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags '' Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags '' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.86.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.86.tar.gz' to 'psm2' diff --git a/tests/scripts/dl_dep.sh/0.8.0/ngio.out b/tests/scripts/dl_dep.sh/0.8.0/ngio.out index f0c9f7959..e6cd7bdcc 100644 --- a/tests/scripts/dl_dep.sh/0.8.0/ngio.out +++ b/tests/scripts/dl_dep.sh/0.8.0/ngio.out @@ -8,6 +8,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[41caa Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.6.3]' and flags '' Downloaded 'https://github.com/facebook/rocksdb/archive/v6.2.2.tar.gz' to 'rocksdb' Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags '' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.86.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.86.tar.gz' to 'psm2' Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags '' Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development' diff --git a/tests/scripts/dl_dep.sh/0.9.0/marenostrum4.out b/tests/scripts/dl_dep.sh/0.9.0/marenostrum4.out index e76b17882..2a2aaf6c2 100644 --- a/tests/scripts/dl_dep.sh/0.9.0/marenostrum4.out +++ b/tests/scripts/dl_dep.sh/0.9.0/marenostrum4.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.0/mogon2.out b/tests/scripts/dl_dep.sh/0.9.0/mogon2.out index e76b17882..2a2aaf6c2 100644 --- a/tests/scripts/dl_dep.sh/0.9.0/mogon2.out +++ b/tests/scripts/dl_dep.sh/0.9.0/mogon2.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.0/ngio.out b/tests/scripts/dl_dep.sh/0.9.0/ngio.out index e76b17882..2a2aaf6c2 100644 --- a/tests/scripts/dl_dep.sh/0.9.0/ngio.out +++ b/tests/scripts/dl_dep.sh/0.9.0/ngio.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.0/omnipath_psm2.out b/tests/scripts/dl_dep.sh/0.9.0/omnipath_psm2.out index e76b17882..2a2aaf6c2 100644 --- a/tests/scripts/dl_dep.sh/0.9.0/omnipath_psm2.out +++ b/tests/scripts/dl_dep.sh/0.9.0/omnipath_psm2.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.1/all.out b/tests/scripts/dl_dep.sh/0.9.1/all.out index 35b6b5217..9cbff6342 100644 --- a/tests/scripts/dl_dep.sh/0.9.1/all.out +++ b/tests/scripts/dl_dep.sh/0.9.1/all.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.1/marenostrum4.out b/tests/scripts/dl_dep.sh/0.9.1/marenostrum4.out index 5185b0db8..b90a686dd 100644 --- a/tests/scripts/dl_dep.sh/0.9.1/marenostrum4.out +++ b/tests/scripts/dl_dep.sh/0.9.1/marenostrum4.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.1/mogon2.out b/tests/scripts/dl_dep.sh/0.9.1/mogon2.out index 5185b0db8..b90a686dd 100644 --- a/tests/scripts/dl_dep.sh/0.9.1/mogon2.out +++ b/tests/scripts/dl_dep.sh/0.9.1/mogon2.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.1/ngio.out b/tests/scripts/dl_dep.sh/0.9.1/ngio.out index 5185b0db8..b90a686dd 100644 --- a/tests/scripts/dl_dep.sh/0.9.1/ngio.out +++ b/tests/scripts/dl_dep.sh/0.9.1/ngio.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.1/omnipath_psm2.out b/tests/scripts/dl_dep.sh/0.9.1/omnipath_psm2.out index e76b17882..2a2aaf6c2 100644 --- a/tests/scripts/dl_dep.sh/0.9.1/omnipath_psm2.out +++ b/tests/scripts/dl_dep.sh/0.9.1/omnipath_psm2.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.1/p9.out b/tests/scripts/dl_dep.sh/0.9.1/p9.out index 3a99bb523..b1eee01ba 100644 --- a/tests/scripts/dl_dep.sh/0.9.1/p9.out +++ b/tests/scripts/dl_dep.sh/0.9.1/p9.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.2/all.out b/tests/scripts/dl_dep.sh/0.9.2/all.out index 4a1ab9e6f..4b5a73fda 100644 --- a/tests/scripts/dl_dep.sh/0.9.2/all.out +++ b/tests/scripts/dl_dep.sh/0.9.2/all.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.2/arm.out b/tests/scripts/dl_dep.sh/0.9.2/arm.out index 2c61edb9c..8725e5892 100644 --- a/tests/scripts/dl_dep.sh/0.9.2/arm.out +++ b/tests/scripts/dl_dep.sh/0.9.2/arm.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.2/marenostrum4.out b/tests/scripts/dl_dep.sh/0.9.2/marenostrum4.out index 657154fdc..fe6f4afec 100644 --- a/tests/scripts/dl_dep.sh/0.9.2/marenostrum4.out +++ b/tests/scripts/dl_dep.sh/0.9.2/marenostrum4.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.2/mogon2.out b/tests/scripts/dl_dep.sh/0.9.2/mogon2.out index 657154fdc..fe6f4afec 100644 --- a/tests/scripts/dl_dep.sh/0.9.2/mogon2.out +++ b/tests/scripts/dl_dep.sh/0.9.2/mogon2.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.2/ngio.out b/tests/scripts/dl_dep.sh/0.9.2/ngio.out index 657154fdc..fe6f4afec 100644 --- a/tests/scripts/dl_dep.sh/0.9.2/ngio.out +++ b/tests/scripts/dl_dep.sh/0.9.2/ngio.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.2/omnipath_psm2.out b/tests/scripts/dl_dep.sh/0.9.2/omnipath_psm2.out index d26b498ca..96e22237b 100644 --- a/tests/scripts/dl_dep.sh/0.9.2/omnipath_psm2.out +++ b/tests/scripts/dl_dep.sh/0.9.2/omnipath_psm2.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' diff --git a/tests/scripts/dl_dep.sh/0.9.2/p9.out b/tests/scripts/dl_dep.sh/0.9.2/p9.out index 3a99bb523..b1eee01ba 100644 --- a/tests/scripts/dl_dep.sh/0.9.2/p9.out +++ b/tests/scripts/dl_dep.sh/0.9.2/p9.out @@ -1,7 +1,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' -- GitLab From 4f5bf1872caa18fd79675e88cfeda81f3176a8e8 Mon Sep 17 00:00:00 2001 From: Marc Vef Date: Tue, 27 Jun 2023 18:51:02 +0200 Subject: [PATCH 2/9] Fix margo deprecated code --- src/daemon/handler/srv_data.cpp | 4 ++-- src/daemon/handler/srv_metadata.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/daemon/handler/srv_data.cpp b/src/daemon/handler/srv_data.cpp index b15ae4b7d..b59f5c551 100644 --- a/src/daemon/handler/srv_data.cpp +++ b/src/daemon/handler/srv_data.cpp @@ -109,7 +109,7 @@ rpc_srv_write(hg_handle_t handle) { return gkfs::rpc::cleanup_respond(&handle, &in, &out, &bulk_handle); } auto hgi = margo_get_info(handle); - auto mid = margo_hg_info_get_instance(hgi); + auto mid = margo_hg_handle_get_instance(handle); auto bulk_size = margo_bulk_get_size(in.bulk_handle); GKFS_DATA->spdlogger()->debug( "{}() path: '{}' chunk_start '{}' chunk_end '{}' chunk_n '{}' total_chunk_size '{}' bulk_size: '{}' offset: '{}'", @@ -412,7 +412,7 @@ rpc_srv_read(hg_handle_t handle) { return gkfs::rpc::cleanup_respond(&handle, &in, &out, &bulk_handle); } auto hgi = margo_get_info(handle); - auto mid = margo_hg_info_get_instance(hgi); + auto mid = margo_hg_handle_get_instance(handle); auto bulk_size = margo_bulk_get_size(in.bulk_handle); GKFS_DATA->spdlogger()->debug( diff --git a/src/daemon/handler/srv_metadata.cpp b/src/daemon/handler/srv_metadata.cpp index e68069797..1339170b9 100644 --- a/src/daemon/handler/srv_metadata.cpp +++ b/src/daemon/handler/srv_metadata.cpp @@ -537,7 +537,7 @@ rpc_srv_get_dirents(hg_handle_t handle) { // Retrieve size of source buffer auto hgi = margo_get_info(handle); - auto mid = margo_hg_info_get_instance(hgi); + auto mid = margo_hg_handle_get_instance(handle); auto bulk_size = margo_bulk_get_size(in.bulk_handle); GKFS_DATA->spdlogger()->debug("{}() Got RPC: path '{}' bulk_size '{}' ", __func__, in.path, bulk_size); @@ -696,7 +696,7 @@ rpc_srv_get_dirents_extended(hg_handle_t handle) { // Retrieve size of source buffer auto hgi = margo_get_info(handle); - auto mid = margo_hg_info_get_instance(hgi); + auto mid = margo_hg_handle_get_instance(handle); auto bulk_size = margo_bulk_get_size(in.bulk_handle); GKFS_DATA->spdlogger()->debug("{}() Got RPC: path '{}' bulk_size '{}' ", __func__, in.path, bulk_size); -- GitLab From b3902693ab62b0d5e7fc5c4184b98bc63915e9ca Mon Sep 17 00:00:00 2001 From: Marc Vef Date: Tue, 27 Jun 2023 18:52:53 +0200 Subject: [PATCH 3/9] Migrated to margo-hg-shim --- include/client/rpc/rpc_types.hpp | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/include/client/rpc/rpc_types.hpp b/include/client/rpc/rpc_types.hpp index a3fa9b64a..4c756dec2 100644 --- a/include/client/rpc/rpc_types.hpp +++ b/include/client/rpc/rpc_types.hpp @@ -85,10 +85,10 @@ struct fs_config { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 3033006080; + constexpr static const uint64_t public_id = 1; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::fs_config; @@ -259,10 +259,10 @@ struct create { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 796590080; + constexpr static const uint64_t public_id = 2; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::create; @@ -375,10 +375,10 @@ struct stat { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 1396244480; + constexpr static const uint64_t public_id = 3; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::stat; @@ -494,10 +494,10 @@ struct remove_metadata { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 2087845888; + constexpr static const uint64_t public_id = 4; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::remove_metadata; @@ -618,10 +618,10 @@ struct decr_size { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 1291649024; + constexpr static const uint64_t public_id = 5; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::decr_size; @@ -734,10 +734,10 @@ struct update_metadentry { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 99483648; + constexpr static const uint64_t public_id = 6; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::update_metadentry; @@ -960,10 +960,10 @@ struct get_metadentry_size { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 3426484224; + constexpr static const uint64_t public_id = 7; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::get_metadentry_size; @@ -1076,10 +1076,10 @@ struct update_metadentry_size { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 2760900608; + constexpr static const uint64_t public_id = 8; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::update_metadentry_size; @@ -1216,10 +1216,10 @@ struct mk_symlink { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 3207004160; + constexpr static const uint64_t public_id = 9; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::mk_symlink; @@ -1334,10 +1334,10 @@ struct remove_data { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 2649292800; + constexpr static const uint64_t public_id = 10; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::remove_data; @@ -1442,10 +1442,10 @@ struct write_data { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 3716481024; + constexpr static const uint64_t public_id = 11; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::write; @@ -1627,10 +1627,10 @@ struct read_data { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 892207104; + constexpr static const uint64_t public_id = 12; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::read; @@ -1812,10 +1812,10 @@ struct trunc_data { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 1850933248; + constexpr static const uint64_t public_id = 13; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::truncate; @@ -1931,10 +1931,10 @@ struct get_dirents { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 4121034752; + constexpr static const uint64_t public_id = 14; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::get_dirents; @@ -2055,10 +2055,10 @@ struct get_dirents_extended { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 1463943168; + constexpr static const uint64_t public_id = 15; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::get_dirents_extended; @@ -2181,10 +2181,10 @@ struct chunk_stat { // RPC public identifier // (N.B: we reuse the same IDs assigned by Margo so that the daemon // understands Hermes RPCs) - constexpr static const uint64_t public_id = 532742144; + constexpr static const uint64_t public_id = 16; // RPC internal Mercury identifier - constexpr static const hg_id_t mercury_id = public_id; + constexpr static const hg_id_t mercury_id = 0; // RPC name constexpr static const auto name = gkfs::rpc::tag::get_chunk_stat; -- GitLab From a54d0d95f20796fab873397549cfd9a6c2097530 Mon Sep 17 00:00:00 2001 From: Marc Vef Date: Sun, 9 Jun 2024 11:13:40 +0200 Subject: [PATCH 4/9] Set Hermes submodule to master --- external/hermes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/hermes b/external/hermes index 98272ebc2..acc91470f 160000 --- a/external/hermes +++ b/external/hermes @@ -1 +1 @@ -Subproject commit 98272ebc24405f556b0c0d23405087976d817c7a +Subproject commit acc91470f1a493f5754d06731d648319ee59e604 -- GitLab From 11105a2888ed7cba50fae98a88574290f9a6e649 Mon Sep 17 00:00:00 2001 From: Marc Vef Date: Sun, 9 Jun 2024 11:25:16 +0200 Subject: [PATCH 5/9] Updating bats to 0.9.3 --- scripts/profiles/0.9.3/all.specs | 86 ------------------- scripts/profiles/0.9.3/infiniband_verbs.specs | 2 +- scripts/profiles/0.9.3/mogon2.specs | 7 +- tests/scripts/compile_dep.sh/0.9.3/all.out | 14 --- tests/scripts/compile_dep.sh/0.9.3/direct.out | 6 -- tests/scripts/compile_dep.sh/0.9.3/mogon2.out | 1 - tests/scripts/dl_dep.sh/0.9.3/agios.out | 13 +-- tests/scripts/dl_dep.sh/0.9.3/all.out | 13 --- tests/scripts/dl_dep.sh/0.9.3/arm.out | 13 +-- tests/scripts/dl_dep.sh/0.9.3/ci.out | 10 ++- tests/scripts/dl_dep.sh/0.9.3/default.out | 14 +-- tests/scripts/dl_dep.sh/0.9.3/direct.out | 7 -- .../dl_dep.sh/0.9.3/infiniband_verbs.out | 13 +-- .../scripts/dl_dep.sh/0.9.3/marenostrum4.out | 16 ++-- tests/scripts/dl_dep.sh/0.9.3/mogon2.out | 17 ++-- tests/scripts/dl_dep.sh/0.9.3/ngio.out | 16 ++-- .../scripts/dl_dep.sh/0.9.3/omnipath_psm2.out | 16 ++-- tests/scripts/dl_dep.sh/0.9.3/p9.out | 14 +-- 18 files changed, 83 insertions(+), 195 deletions(-) delete mode 100644 scripts/profiles/0.9.3/all.specs delete mode 100644 tests/scripts/compile_dep.sh/0.9.3/all.out delete mode 100644 tests/scripts/compile_dep.sh/0.9.3/direct.out delete mode 100644 tests/scripts/dl_dep.sh/0.9.3/all.out delete mode 100644 tests/scripts/dl_dep.sh/0.9.3/direct.out diff --git a/scripts/profiles/0.9.3/all.specs b/scripts/profiles/0.9.3/all.specs deleted file mode 100644 index 67396b8dc..000000000 --- a/scripts/profiles/0.9.3/all.specs +++ /dev/null @@ -1,86 +0,0 @@ -################################################################################ -# Copyright 2018-2024, Barcelona Supercomputing Center (BSC), Spain # -# Copyright 2015-2024, Johannes Gutenberg Universitaet Mainz, Germany # -# # -# This software was partially supported by the # -# EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu). # -# # -# This software was partially supported by the # -# ADA-FS project under the SPPEXA project funded by the DFG. # -# # -# This file is part of GekkoFS. # -# # -# GekkoFS is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# GekkoFS is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with GekkoFS. If not, see . # -# # -# SPDX-License-Identifier: GPL-3.0-or-later # -################################################################################ - -# vi: ft=bash - -# Variables to be imported into the scripts -declare -A wgetdeps clonedeps clonedeps_args clonedeps_patches extra_install_args -declare -a order - -# Comment that should be displayed when printing the profile -comment="Dependencies for Mogon 2 supercomputer" - -# Dependencies that must be downloaded directly -wgetdeps=( - ["lz4"]="1.9.4" - ["capstone"]="4.0.2" - ["argobots"]="1.1" - ["rocksdb"]="8.10.0" - ["psm2"]="11.2.185" - ["json-c"]="0.17-20230812" - ["curl"]="7.88.1" - ["prometheus-cpp"]="v1.0.0" -) - -# Dependencies that must be cloned -clonedeps=( - ["libfabric"]="HEAD@v1.20.1" - ["mercury"]="v2.3.1" - ["margo"]="v0.15.0" - ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d" - ["agios"]="c26a6544200f823ebb8f890dd94e653d148bf226@development" - ["parallax"]="ffdea6e820f5c4c2d33e60d9a4b15ef9e6bbcfdd" -) - -# Extra arguments for git clone -clonedeps_args=( - ["mercury"]="--recurse-submodules" -) - -# Patches that should be applied post-clone -clonedeps_patches=( - ["syscall_intercept"]="syscall_intercept.patch" -) - -# Ordering that MUST be followed when downloading -order=( - "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" - "agios" "curl" "prometheus-cpp" "parallax" -) - -# Extra arguments passed to the installation script. As such, they can -# reference the following variables: -# - CMAKE: a variable that expands to the cmake binary -# - SOURCE_DIR: the directory where the sources for the package were -# downloaded -# - INSTALL_DIR: the directory where the package should be installed -# - CORES: the number of cores to use when building -# - PERFORM_TEST: whether tests for the package should be executed -extra_install_args=( - ["libfabric"]="--enable-psm2=yes --with-psm2-src=${SOURCE_DIR}/psm2" -) diff --git a/scripts/profiles/0.9.3/infiniband_verbs.specs b/scripts/profiles/0.9.3/infiniband_verbs.specs index c5ddd41c8..4da1b5208 100644 --- a/scripts/profiles/0.9.3/infiniband_verbs.specs +++ b/scripts/profiles/0.9.3/infiniband_verbs.specs @@ -48,7 +48,7 @@ wgetdeps=( clonedeps=( ["libfabric%verbs"]="HEAD@v1.17.0" ["mercury"]="v2.3.0" - ["margo"]="v0.14.1" + ["margo"]="v0.15.0" ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d" ) diff --git a/scripts/profiles/0.9.3/mogon2.specs b/scripts/profiles/0.9.3/mogon2.specs index 5ac17de8a..8f5801f0e 100644 --- a/scripts/profiles/0.9.3/mogon2.specs +++ b/scripts/profiles/0.9.3/mogon2.specs @@ -52,7 +52,6 @@ clonedeps=( ["margo"]="v0.15.0" ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d" ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155" -# ["parallax"]="c130decd7a71c60c20b98d6a23924f05f754c3cd" ) # Extra arguments for git clone @@ -67,7 +66,7 @@ clonedeps_patches=( # Ordering that MUST be followed when downloading order=( - "lz4" "capstone" "json-c" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" + "lz4" "capstone" "json-c" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" "psm2" ) # Extra arguments passed to the installation script. As such, they can @@ -79,6 +78,6 @@ order=( # - CORES: the number of cores to use when building # - PERFORM_TEST: whether tests for the package should be executed extra_install_args=( - ["libfabric"]="--enable-psm2=yes --enable-opx=yes" -# ["libfabric"]="--enable-psm2=yes --with-psm2-src=${SOURCE_DIR}/psm2" +# ["libfabric"]="--enable-psm2=yes --enable-opx=yes" + ["libfabric"]="--enable-psm2=yes --with-psm2-src=${SOURCE_DIR}/psm2" ) diff --git a/tests/scripts/compile_dep.sh/0.9.3/all.out b/tests/scripts/compile_dep.sh/0.9.3/all.out deleted file mode 100644 index 2fcd55b6f..000000000 --- a/tests/scripts/compile_dep.sh/0.9.3/all.out +++ /dev/null @@ -1,14 +0,0 @@ -######## Installing: lz4 ############################### -######## Installing: capstone ############################### -######## Installing: json-c ############################### -######## Installing: psm2 ############################### -WARNING: Install script for 'psm2' not found. Skipping. -######## Installing: libfabric ############################### -######## Installing: mercury ############################### -######## Installing: argobots ############################### -######## Installing: margo ############################### -######## Installing: rocksdb ############################### -######## Installing: syscall_intercept ############################### -######## Installing: agios ############################### -######## Installing: parallax ############################### -Done \ No newline at end of file diff --git a/tests/scripts/compile_dep.sh/0.9.3/direct.out b/tests/scripts/compile_dep.sh/0.9.3/direct.out deleted file mode 100644 index 816266773..000000000 --- a/tests/scripts/compile_dep.sh/0.9.3/direct.out +++ /dev/null @@ -1,6 +0,0 @@ -######## Installing: libfabric ############################### -######## Installing: mercury ############################### -######## Installing: argobots ############################### -######## Installing: margo ############################### -######## Installing: rocksdb ############################### -######## Installing: syscall_intercept ############################### diff --git a/tests/scripts/compile_dep.sh/0.9.3/mogon2.out b/tests/scripts/compile_dep.sh/0.9.3/mogon2.out index 1af91c3cf..e05da6537 100644 --- a/tests/scripts/compile_dep.sh/0.9.3/mogon2.out +++ b/tests/scripts/compile_dep.sh/0.9.3/mogon2.out @@ -9,4 +9,3 @@ WARNING: Install script for 'psm2' not found. Skipping. ######## Installing: margo ############################### ######## Installing: rocksdb ############################### ######## Installing: syscall_intercept ############################### -######## Installing: parallax ############################### diff --git a/tests/scripts/dl_dep.sh/0.9.3/agios.out b/tests/scripts/dl_dep.sh/0.9.3/agios.out index a74c129fe..53de3a4be 100644 --- a/tests/scripts/dl_dep.sh/0.9.3/agios.out +++ b/tests/scripts/dl_dep.sh/0.9.3/agios.out @@ -1,11 +1,12 @@ -Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' +Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' -Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' -Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' +Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c' +Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1' +Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.3.1]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' -Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags '' +Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.15.0]' and flags '' Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb' Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags '' +Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'... Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development' -Done \ No newline at end of file +Done diff --git a/tests/scripts/dl_dep.sh/0.9.3/all.out b/tests/scripts/dl_dep.sh/0.9.3/all.out deleted file mode 100644 index 19052d3e3..000000000 --- a/tests/scripts/dl_dep.sh/0.9.3/all.out +++ /dev/null @@ -1,13 +0,0 @@ -Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' -Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' -Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' -Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' -Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' -Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' -Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags '' -Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb' -Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags '' -Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development' -Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[ffdea6e820f5c4c2d33e60d9a4b15ef9e6bbcfdd]' and flags '' -Done \ No newline at end of file diff --git a/tests/scripts/dl_dep.sh/0.9.3/arm.out b/tests/scripts/dl_dep.sh/0.9.3/arm.out index 087b7e983..7daa98abf 100644 --- a/tests/scripts/dl_dep.sh/0.9.3/arm.out +++ b/tests/scripts/dl_dep.sh/0.9.3/arm.out @@ -1,11 +1,12 @@ -Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' +Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' -Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' -Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' -Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' +Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1' +Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.3.1]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' -Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags '' +Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.15.0]' and flags '' Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb' Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[fb73c3924b502e2840a5dc8a18746e395b06a8a6]' and flags '' +Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch.arm64'... Done diff --git a/tests/scripts/dl_dep.sh/0.9.3/ci.out b/tests/scripts/dl_dep.sh/0.9.3/ci.out index 1cbaf3e06..d74b12e34 100644 --- a/tests/scripts/dl_dep.sh/0.9.3/ci.out +++ b/tests/scripts/dl_dep.sh/0.9.3/ci.out @@ -1,9 +1,11 @@ -Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' -Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' +Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.17.0' +Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.3.1]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' -Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags '' +Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.15.0]' and flags '' Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb' Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags '' +Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'... Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development' Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[ffdea6e820f5c4c2d33e60d9a4b15ef9e6bbcfdd]' and flags '' -Done \ No newline at end of file +Downloaded 'https://github.com/jupp0r/prometheus-cpp/releases/download/v1.0.0/prometheus-cpp-with-submodules.tar.gz' to 'prometheus-cpp' +Done diff --git a/tests/scripts/dl_dep.sh/0.9.3/default.out b/tests/scripts/dl_dep.sh/0.9.3/default.out index adab1b60f..dc509304e 100644 --- a/tests/scripts/dl_dep.sh/0.9.3/default.out +++ b/tests/scripts/dl_dep.sh/0.9.3/default.out @@ -1,10 +1,12 @@ -Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' +Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' -Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' -Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' +Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c' +Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1' +Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.3.1]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' -Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags '' +Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.15.0]' and flags '' Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb' Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags '' -Done \ No newline at end of file +Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'... +Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept_clone3.patch'... +Done diff --git a/tests/scripts/dl_dep.sh/0.9.3/direct.out b/tests/scripts/dl_dep.sh/0.9.3/direct.out deleted file mode 100644 index 8a4d1e063..000000000 --- a/tests/scripts/dl_dep.sh/0.9.3/direct.out +++ /dev/null @@ -1,7 +0,0 @@ -Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' -Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' -Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' -Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags '' -Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb' -Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags '' -Done \ No newline at end of file diff --git a/tests/scripts/dl_dep.sh/0.9.3/infiniband_verbs.out b/tests/scripts/dl_dep.sh/0.9.3/infiniband_verbs.out index 34854d05b..59f91e5c7 100644 --- a/tests/scripts/dl_dep.sh/0.9.3/infiniband_verbs.out +++ b/tests/scripts/dl_dep.sh/0.9.3/infiniband_verbs.out @@ -1,10 +1,11 @@ -Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' +Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' -Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric%verbs' with commit '[HEAD]' and flags '--branch=v1.13.2' -Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' +Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c' +Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric%verbs' with commit '[HEAD]' and flags '--branch=v1.17.0' +Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.3.0]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' -Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags '' +Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.15.0]' and flags '' Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb' Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags '' -Done \ No newline at end of file +Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'... +Done diff --git a/tests/scripts/dl_dep.sh/0.9.3/marenostrum4.out b/tests/scripts/dl_dep.sh/0.9.3/marenostrum4.out index addae0a62..01c527090 100644 --- a/tests/scripts/dl_dep.sh/0.9.3/marenostrum4.out +++ b/tests/scripts/dl_dep.sh/0.9.3/marenostrum4.out @@ -1,12 +1,14 @@ -Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' +Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' -Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' -Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' -Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' +Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.17.0' +Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.3.1]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' -Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags '' +Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.15.0]' and flags '' Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb' Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags '' +Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'... +Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags '' Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[c130decd7a71c60c20b98d6a23924f05f754c3cd]' and flags '' -Done \ No newline at end of file +Done diff --git a/tests/scripts/dl_dep.sh/0.9.3/mogon2.out b/tests/scripts/dl_dep.sh/0.9.3/mogon2.out index addae0a62..6f906ce8e 100644 --- a/tests/scripts/dl_dep.sh/0.9.3/mogon2.out +++ b/tests/scripts/dl_dep.sh/0.9.3/mogon2.out @@ -1,12 +1,13 @@ -Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' +Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' -Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' -Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' -Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' +Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c' +Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1' +Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.3.1]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' -Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags '' +Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.15.0]' and flags '' Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb' Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags '' -Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[c130decd7a71c60c20b98d6a23924f05f754c3cd]' and flags '' -Done \ No newline at end of file +Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'... +Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags '' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Done diff --git a/tests/scripts/dl_dep.sh/0.9.3/ngio.out b/tests/scripts/dl_dep.sh/0.9.3/ngio.out index addae0a62..340fb21ad 100644 --- a/tests/scripts/dl_dep.sh/0.9.3/ngio.out +++ b/tests/scripts/dl_dep.sh/0.9.3/ngio.out @@ -1,12 +1,14 @@ -Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' +Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' -Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' -Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' -Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' +Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1' +Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.3.1]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' -Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags '' +Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.15.0]' and flags '' Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb' Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags '' +Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'... +Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags '' Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[c130decd7a71c60c20b98d6a23924f05f754c3cd]' and flags '' -Done \ No newline at end of file +Done diff --git a/tests/scripts/dl_dep.sh/0.9.3/omnipath_psm2.out b/tests/scripts/dl_dep.sh/0.9.3/omnipath_psm2.out index 9267747ca..4697b3280 100644 --- a/tests/scripts/dl_dep.sh/0.9.3/omnipath_psm2.out +++ b/tests/scripts/dl_dep.sh/0.9.3/omnipath_psm2.out @@ -1,11 +1,13 @@ -Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' +Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' -Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' -Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' -Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' +Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1' +Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.3.1]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' -Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags '' +Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.15.0]' and flags '' Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb' Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags '' -Done \ No newline at end of file +Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'... +Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags '' +Done diff --git a/tests/scripts/dl_dep.sh/0.9.3/p9.out b/tests/scripts/dl_dep.sh/0.9.3/p9.out index 68d0384db..8041a0cc0 100644 --- a/tests/scripts/dl_dep.sh/0.9.3/p9.out +++ b/tests/scripts/dl_dep.sh/0.9.3/p9.out @@ -1,11 +1,13 @@ -Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4' +Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4' Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone' -Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c' -Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' -Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2' -Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules' +Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c' +Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2' +Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1' +Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.3.1]' and flags '--recurse-submodules' Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots' -Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags '' +Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.15.0]' and flags '' Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb' Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[6eb27a9d2053bb2ac3bb9ce30e13b64ce055c19f]' and flags '' +Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'... +Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags '' Done -- GitLab From e144723b7b9088653d24c7388053d70f77683490 Mon Sep 17 00:00:00 2001 From: Marc Vef Date: Sun, 9 Jun 2024 11:54:23 +0200 Subject: [PATCH 6/9] Update Docker to dependency updates: 0.9.3-rc1 --- docker/0.9.3/core/Makefile | 6 +++--- docker/0.9.3/deps/Dockerfile | 2 +- docker/0.9.3/deps/Makefile | 6 +++--- docker/0.9.3/docs/Dockerfile | 2 +- docker/0.9.3/docs/Makefile | 6 +++--- docker/0.9.3/linter/Dockerfile | 2 +- docker/0.9.3/linter/Makefile | 6 +++--- docker/0.9.3/testing/Dockerfile | 2 +- docker/0.9.3/testing/Makefile | 6 +++--- docker/latest | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docker/0.9.3/core/Makefile b/docker/0.9.3/core/Makefile index 9c27a583a..df4c8cb28 100644 --- a/docker/0.9.3/core/Makefile +++ b/docker/0.9.3/core/Makefile @@ -1,10 +1,10 @@ .PHONY: all amd64: - docker buildx build --platform amd64 -t gekkofs/core:0.9.3 . + docker buildx build --platform amd64 -t gekkofs/core:0.9.3-rc1 . aarch64: - docker buildx build --platform aarch64 -t gekkofs/core:0.9.3 . + docker buildx build --platform aarch64 -t gekkofs/core:0.9.3-rc1 . all: - docker buildx build -t gekkofs/core:0.9.3 . + docker buildx build -t gekkofs/core:0.9.3-rc1 . diff --git a/docker/0.9.3/deps/Dockerfile b/docker/0.9.3/deps/Dockerfile index ca4ecc8a6..99641f29f 100644 --- a/docker/0.9.3/deps/Dockerfile +++ b/docker/0.9.3/deps/Dockerfile @@ -1,4 +1,4 @@ -FROM gekkofs/core:0.9.3 +FROM gekkofs/core:0.9.3-rc1 LABEL Description="Debian-based environment to build GekkoFS" diff --git a/docker/0.9.3/deps/Makefile b/docker/0.9.3/deps/Makefile index a97d3195f..d8b7fda00 100644 --- a/docker/0.9.3/deps/Makefile +++ b/docker/0.9.3/deps/Makefile @@ -11,13 +11,13 @@ copy-scripts: cp -R $(GIT_ROOT)/scripts $(CWD)/scripts build: copy-scripts - docker build -t gekkofs/deps:0.9.3 . + docker build -t gekkofs/deps:0.9.3-rc1 . build-amd64: copy-scripts - docker build --platform amd64 -t gekkofs/deps:0.9.3 . + docker build --platform amd64 -t gekkofs/deps:0.9.3-rc1 . build-aarch64: copy-scripts - docker build --platform aarch64 -t gekkofs/deps:0.9.3 . + docker build --platform aarch64 -t gekkofs/deps:0.9.3-rc1 . remove-scripts: - rm -rf $(CWD)/scripts diff --git a/docker/0.9.3/docs/Dockerfile b/docker/0.9.3/docs/Dockerfile index f770f3a23..ad4101f0c 100644 --- a/docker/0.9.3/docs/Dockerfile +++ b/docker/0.9.3/docs/Dockerfile @@ -1,4 +1,4 @@ -FROM gekkofs/deps:0.9.3 +FROM gekkofs/deps:0.9.3-rc1 LABEL Description="Debian-based environment suitable to build GekkoFS' documentation" diff --git a/docker/0.9.3/docs/Makefile b/docker/0.9.3/docs/Makefile index c6c89926a..049cb93ab 100644 --- a/docker/0.9.3/docs/Makefile +++ b/docker/0.9.3/docs/Makefile @@ -1,10 +1,10 @@ .PHONY: all amd64: - docker build --platform amd64 -t gekkofs/docs:0.9.3 . + docker build --platform amd64 -t gekkofs/docs:0.9.3-rc1 . aarch64: - docker build --platform aarch64 -t gekkofs/docs:0.9.3 . + docker build --platform aarch64 -t gekkofs/docs:0.9.3-rc1 . all: - docker build -t gekkofs/docs:0.9.3 . \ No newline at end of file + docker build -t gekkofs/docs:0.9.3-rc1 . diff --git a/docker/0.9.3/linter/Dockerfile b/docker/0.9.3/linter/Dockerfile index f5d57118e..c51a7f447 100644 --- a/docker/0.9.3/linter/Dockerfile +++ b/docker/0.9.3/linter/Dockerfile @@ -1,4 +1,4 @@ -FROM gekkofs/core:0.9.3 +FROM gekkofs/core:0.9.3-rc1 LABEL Description="Debian-based environment to check the formatting of GekkoFS code" diff --git a/docker/0.9.3/linter/Makefile b/docker/0.9.3/linter/Makefile index f427eb387..fd9300951 100644 --- a/docker/0.9.3/linter/Makefile +++ b/docker/0.9.3/linter/Makefile @@ -1,10 +1,10 @@ .PHONY: all amd64: - docker buildx build --platform amd64 -t gekkofs/linter:0.9.3 . + docker buildx build --platform amd64 -t gekkofs/linter:0.9.3-rc1 . aarch64: - docker buildx build --platform aarch64 -t gekkofs/linter:0.9.3 . + docker buildx build --platform aarch64 -t gekkofs/linter:0.9.3-rc1 . all: - docker buildx build -t gekkofs/linter:0.9.3 . + docker buildx build -t gekkofs/linter:0.9.3-rc1 . diff --git a/docker/0.9.3/testing/Dockerfile b/docker/0.9.3/testing/Dockerfile index 971944a86..fd0da2e44 100644 --- a/docker/0.9.3/testing/Dockerfile +++ b/docker/0.9.3/testing/Dockerfile @@ -1,4 +1,4 @@ -FROM gekkofs/deps:0.9.3 +FROM gekkofs/deps:0.9.3-rc1 LABEL Description="Debian-based environment to test GekkoFS" diff --git a/docker/0.9.3/testing/Makefile b/docker/0.9.3/testing/Makefile index b5908b539..5d4d43f89 100644 --- a/docker/0.9.3/testing/Makefile +++ b/docker/0.9.3/testing/Makefile @@ -1,10 +1,10 @@ .PHONY: all amd64: - docker build --platform amd64 -t gekkofs/testing:0.9.3 . + docker build --platform amd64 -t gekkofs/testing:0.9.3-rc1 . aarch64: - docker build --platform aarch64 -t gekkofs/testing:0.9.3 . + docker build --platform aarch64 -t gekkofs/testing:0.9.3-rc1 . all: - docker build -t gekkofs/testing:0.9.3 . + docker build -t gekkofs/testing:0.9.3-rc1 . diff --git a/docker/latest b/docker/latest index f76f91317..b3ec1638f 120000 --- a/docker/latest +++ b/docker/latest @@ -1 +1 @@ -0.9.2 \ No newline at end of file +0.9.3 \ No newline at end of file -- GitLab From f08068080b3688a9c7a342f18a22a1c3956ba613 Mon Sep 17 00:00:00 2001 From: Marc Vef Date: Sun, 9 Jun 2024 11:56:16 +0200 Subject: [PATCH 7/9] Update Gitlab CI to new dependencies --- .gitlab-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19c076f05..c43ec0cdd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,14 +24,14 @@ variables: GIT_SUBMODULE_STRATEGY: recursive # base image -image: gekkofs/core:0.9.3 +image: gekkofs/core:0.9.3-rc1 ################################################################################ ## Validating ################################################################################ check format: stage: lint - image: gekkofs/linter:0.9.3 + image: gekkofs/linter:0.9.3-rc1 needs: [] script: - ${SCRIPTS_DIR}/check_format.sh @@ -45,7 +45,7 @@ check format: ################################################################################ gkfs: stage: build - image: gekkofs/deps:0.9.3 + image: gekkofs/deps:0.9.3-rc1 interruptible: true needs: [] script: @@ -72,7 +72,7 @@ gkfs: ## == tests for scripts ==================== scripts: stage: test - image: gekkofs/testing:0.9.3 + image: gekkofs/testing:0.9.3-rc1 needs: [] script: - mkdir -p ${BUILD_PATH}/tests/scripts @@ -88,7 +88,7 @@ scripts: ## == integration tests for gkfs =========== gkfs:integration: stage: test - image: gekkofs/testing:0.9.3 + image: gekkofs/testing:0.9.3-rc1 interruptible: true needs: ['gkfs'] parallel: @@ -137,7 +137,7 @@ gkfs:integration: ## == integration tests for gkfwd ========== gkfwd:integration: stage: test - image: gekkofs/testing:0.9.3 + image: gekkofs/testing:0.9.3-rc1 interruptible: true needs: ['gkfs'] parallel: @@ -187,7 +187,7 @@ gkfwd:integration: ## == unit tests for gkfs ================== gkfs:unit: stage: test - image: gekkofs/testing:0.9.3 + image: gekkofs/testing:0.9.3-rc1 needs: ['gkfs'] script: ## Add path to mkfs.kreon @@ -225,7 +225,7 @@ gkfs:unit: ################################################################################ documentation: stage: docs - image: gekkofs/docs:0.9.3 + image: gekkofs/docs:0.9.3-rc1 needs: [] rules: # we only build the documentation automatically if we are on the @@ -255,7 +255,7 @@ documentation: ## == coverage baseline ==================== coverage:baseline: stage: report - image: gekkofs/testing:0.9.3 + image: gekkofs/testing:0.9.3-rc1 interruptible: true needs: ['gkfs'] @@ -281,7 +281,7 @@ coverage:baseline: coverage: stage: report - image: gekkofs/testing:0.9.3 + image: gekkofs/testing:0.9.3-rc1 # needs: [ 'coverage:baseline', 'gkfs:integration', 'gkfwd:integration', # 'gkfs:unit' ] needs: [ 'coverage:baseline', 'gkfs:integration', 'gkfs:unit', 'gkfwd:integration'] -- GitLab From 6ac5ab1e338fa9848b27ff7dfe55f084ce7cfeba Mon Sep 17 00:00:00 2001 From: Marc Vef Date: Sun, 9 Jun 2024 23:22:57 +0200 Subject: [PATCH 8/9] Update Changelog --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b5517121..c2148a4f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] ### New -- Adding user library `gkfs_user_lib` that can be used to directly link to an application ([!171](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/171)). + +- Added user library `gkfs_user_lib` that can be used to directly link to an + application ([!171](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/171)). - FMT10 and date removal, several dependencies updated. ([!172](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/172)). - Fused GekkoFWD and GekkoFS. GekkoFWD is enabled with the `--enable-following` in the server configuration and the ENV variable `LIBGKFS_FORWARDING_MAP_FILE` in the clients. ([!170](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/170)). @@ -18,6 +20,12 @@ replicas ([!166](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/141) ### Changed + +- Updated GekkoFS dependencies migrating to + margo-shim-hg ([!165](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/165)). + - Improves RPC stability + - Removes manual updates to Mercury public IDs from Hermes-Mercury to Margo + ### Removed ### Fixed -- GitLab From c24041307928fb513dab5ecdf1f72e961810adf7 Mon Sep 17 00:00:00 2001 From: Marc Vef Date: Sun, 9 Jun 2024 23:40:50 +0200 Subject: [PATCH 9/9] Update CMake dependency checks --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16f2bc3ae..b79936eea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,7 +147,7 @@ find_package(PkgConfig REQUIRED) ### Mercury message(STATUS "[${PROJECT_NAME}] Checking for Mercury") -find_package(Mercury 2.0.1 REQUIRED) +find_package(Mercury 2.2.0 REQUIRED) ### Argobots message(STATUS "[${PROJECT_NAME}] Checking for Argobots") @@ -155,7 +155,7 @@ find_package(Argobots 1.1 REQUIRED) ### Margo message(STATUS "[${PROJECT_NAME}] Checking for Margo") -find_package(Margo 0.9.6 REQUIRED) +find_package(Margo 0.14.0 REQUIRED) ### syscall-intercept message(STATUS "[${PROJECT_NAME}] Checking for syscall_intercept") -- GitLab