From d134661b5e409f70f4cd2cf618dc80ce801d9872 Mon Sep 17 00:00:00 2001 From: Ramon Nou Date: Tue, 21 Nov 2023 17:52:52 +0100 Subject: [PATCH 1/5] Fix error handling in scord_adhoc.cpp --- cli/scord_adhoc.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cli/scord_adhoc.cpp b/cli/scord_adhoc.cpp index 8e05de3..faa1020 100644 --- a/cli/scord_adhoc.cpp +++ b/cli/scord_adhoc.cpp @@ -167,7 +167,7 @@ main(int argc, char* argv[]) { 100, false}; - + try { scord::adhoc_storage adhoc_storage = register_adhoc_storage( srv, adhoc_name, type, ctx, resources); @@ -175,7 +175,11 @@ main(int argc, char* argv[]) { fmt::print("AdhocStorage ID: {}\n", adhoc_storage.id()); auto path = deploy_adhoc_storage(srv, adhoc_storage); - + } catch(const std::exception& ex) { + fmt::print(stderr, "Error: {}\n", ex.what()); + return EXIT_FAILURE; + } + // Step 1c : Define job_requirements /* -- GitLab From 3690ae1c0093728246c1c6c9dad60b7050425928 Mon Sep 17 00:00:00 2001 From: Ramon Nou Date: Wed, 22 Nov 2023 07:14:33 +0100 Subject: [PATCH 2/5] Fix exception handling in scord_adhoc.cpp --- cli/scord_adhoc.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cli/scord_adhoc.cpp b/cli/scord_adhoc.cpp index faa1020..8e05de3 100644 --- a/cli/scord_adhoc.cpp +++ b/cli/scord_adhoc.cpp @@ -167,7 +167,7 @@ main(int argc, char* argv[]) { 100, false}; - try { + scord::adhoc_storage adhoc_storage = register_adhoc_storage( srv, adhoc_name, type, ctx, resources); @@ -175,11 +175,7 @@ main(int argc, char* argv[]) { fmt::print("AdhocStorage ID: {}\n", adhoc_storage.id()); auto path = deploy_adhoc_storage(srv, adhoc_storage); - } catch(const std::exception& ex) { - fmt::print(stderr, "Error: {}\n", ex.what()); - return EXIT_FAILURE; - } - + // Step 1c : Define job_requirements /* -- GitLab From 847947eed08229ca2f3388987eb1693b43dbd9f5 Mon Sep 17 00:00:00 2001 From: Ramon Nou Date: Wed, 22 Nov 2023 08:26:25 +0100 Subject: [PATCH 3/5] Fix adhoc_storage response value --- src/lib/detail/impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/detail/impl.cpp b/src/lib/detail/impl.cpp index 8d26b4e..b767a67 100644 --- a/src/lib/detail/impl.cpp +++ b/src/lib/detail/impl.cpp @@ -251,7 +251,7 @@ register_adhoc_storage(const server& srv, const std::string& name, return tl::make_unexpected(ec); } - return scord::adhoc_storage{type, name, resp.value(), ctx, + return scord::adhoc_storage{type, name, resp.value_or(5), ctx, resources}; } } -- GitLab From 9c6e14f93711e2a9bb324c856ced810879aa5e3d Mon Sep 17 00:00:00 2001 From: Ramon Nou Date: Wed, 22 Nov 2023 10:19:10 +0100 Subject: [PATCH 4/5] Fix adhoc_storage initialization bug --- src/lib/detail/impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/detail/impl.cpp b/src/lib/detail/impl.cpp index b767a67..8d26b4e 100644 --- a/src/lib/detail/impl.cpp +++ b/src/lib/detail/impl.cpp @@ -251,7 +251,7 @@ register_adhoc_storage(const server& srv, const std::string& name, return tl::make_unexpected(ec); } - return scord::adhoc_storage{type, name, resp.value_or(5), ctx, + return scord::adhoc_storage{type, name, resp.value(), ctx, resources}; } } -- GitLab From 9accf2143b32435dd658e205d99d2980105becf9 Mon Sep 17 00:00:00 2001 From: Ramon Nou Date: Wed, 22 Nov 2023 14:27:42 +0100 Subject: [PATCH 5/5] Update dependencies in Scord package --- spack/packages/scord/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack/packages/scord/package.py b/spack/packages/scord/package.py index d1f1466..a8f045e 100644 --- a/spack/packages/scord/package.py +++ b/spack/packages/scord/package.py @@ -87,11 +87,11 @@ class Scord(CMakePackage): # specific dependencies # v0.2.0+ depends_on("argobots@1.1", when='@0.2.0:') - depends_on("mochi-margo@0.9.8:", when='@0.2.0:') - depends_on("mochi-thallium@0.10.1:", when='@0.2.0:') + depends_on("mochi-margo@0.14.1:", when='@0.2.0:') + depends_on("mochi-thallium@0.11.3:", when='@0.2.0:') depends_on("boost@1.71 +program_options", when='@0.2.0:') depends_on("redis-plus-plus@1.3.3:", when='@0.2.0:') - depends_on("cargo@0.3.2:", when='@0.3.1:') + depends_on("cargo@0.3.3:", when='@0.3.1:') depends_on("slurm", when='@0.3.1:') -- GitLab