diff --git a/CMakeLists.txt b/CMakeLists.txt index e6ac925995f340028a17600d8414b635b1ff8909..86501d1b6095e3d1be570753e0545b6b7110a660 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -271,10 +271,6 @@ FetchContent_Declare( FetchContent_MakeAvailable(expected) -pkg_check_modules(LIBCONFIG IMPORTED_TARGET libconfig>=1.4.9) - -find_package(AGIOS REQUIRED) - if (SCORD_BUILD_TESTS) enable_testing() diff --git a/README.md b/README.md index fe4269c72b04d87560b9d6c0b2605d0c82783ad1..c42b4aaa0ec7efc4f8b95c0f17e13f73997df9e0 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,6 @@ and need to be available in the system: - [Thallium](https://github.com/mochi-hpc/mochi-thallium) version 0.10.1 or later. - [libconfig-dev] version 1.4.9 or later. -- [agios](https://github.com/francielizanon/agios) (development branch) - [redis-plus-plus](https://github.com/sewenew/redis-plus-plus) version 1.3. 3 or later, and its dependencies: - [hiredis](https://github.com/redis/hiredis) version 0.14.1 or later. diff --git a/cmake/FindAGIOS.cmake b/cmake/FindAGIOS.cmake deleted file mode 100644 index 9139f3bf35d1c369059389b384690426871827d5..0000000000000000000000000000000000000000 --- a/cmake/FindAGIOS.cmake +++ /dev/null @@ -1,79 +0,0 @@ -################################################################################ -# Copyright 2022, Barcelona Supercomputing Center (BSC), Spain # -# # -# This software was partially supported by the EuroHPC-funded project ADMIRE # -# (Project ID: 956748, https://www.admire-eurohpc.eu). # -# # -# This file is part of scord. # -# # -# scord 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. # -# # -# scord 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 scord. If not, see . # -# # -# SPDX-License-Identifier: GPL-3.0-or-later # -################################################################################ - -#[=======================================================================[.rst: -FindAGIOS ---------- - -Find AGIOS include dirs and libraries. - -Use this module by invoking find_package with the form:: - - find_package(AGIOS - [REQUIRED] # Fail with error if yaml-cpp is not found - ) - - -Result Variables -^^^^^^^^^^^^^^^^ - -This will define the following variables: - -``AGIOS_INCLUDE_DIRS`` - Include directories needed to use Agios. -``AGIOS_LIBRARIES`` - Libraries needed to link to Agios. - -Cache Variables -^^^^^^^^^^^^^^^ - -The following cache variables may also be set: - -``AGIOS_INCLUDE_DIR`` - The directory containing ``agios.h``. -``AGIOS_LIBRARY`` - The path to the agios library. - -#]=======================================================================] - - -find_path(AGIOS_INCLUDE_DIR - NAMES agios.h -) - -find_library(AGIOS_LIBRARY - NAMES agios -) - -set(AGIOS_INCLUDE_DIRS ${AGIOS_INCLUDE_DIR}) -set(AGIOS_LIBRARIES ${AGIOS_LIBRARY}) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(AGIOS DEFAULT_MSG AGIOS_LIBRARIES AGIOS_INCLUDE_DIRS) - -mark_as_advanced( - AGIOS_LIBRARY - AGIOS_INCLUDE_DIR -) - diff --git a/docker/0.4.0-wip/Dockerfile b/docker/0.4.0-wip/Dockerfile index 15d5918322a91e3979c6c6d76d97d165ec04f041..78b40ee3eee8e2b7be582e20608fcf253185fe0b 100644 --- a/docker/0.4.0-wip/Dockerfile +++ b/docker/0.4.0-wip/Dockerfile @@ -18,8 +18,6 @@ RUN apt-get update && \ clang \ libc++-dev \ procps \ - # AGIOS dependencies - libconfig-dev \ # Mercury dependencies libltdl-dev \ lbzip2 \ @@ -59,8 +57,6 @@ RUN apt-get update && \ git clone https://github.com/redis/hiredis.git --recurse-submodules && \ cd hiredis && git checkout v1.2.0 && cd .. && \ git clone https://github.com/sewenew/redis-plus-plus --recurse-submodules && \ - git clone https://github.com/francielizanon/agios --recurse-submodules && \ - cd agios && git checkout development && cd .. && \ git clone https://github.com/USCiLab/cereal --recurse-submodules && \ git clone https://github.com/mochi-hpc/mochi-thallium --recurse-submodules && \ git clone https://storage.bsc.es/gitlab/hpc/cargo.git && \ @@ -143,15 +139,6 @@ RUN apt-get update && \ make install -j && \ cd .. && rm -rf build && cd && \ \ - ### agios - cd deps/agios && \ - mkdir build && cd build && \ - cmake -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_PATH} \ - -DCMAKE_BUILD_TYPE:STRING=Release \ - .. && \ - make install -j && \ - cd .. && rm -rf build && cd && \ - \ ### cereal cd deps/cereal && \ mkdir build && cd build && \ diff --git a/spack/packages/agios/package.py b/spack/packages/agios/package.py deleted file mode 100644 index 52e23b93075ecdce6ff97f8841bc141108c8e6b1..0000000000000000000000000000000000000000 --- a/spack/packages/agios/package.py +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -# ---------------------------------------------------------------------------- -# If you submit this package back to Spack as a pull request, -# please first remove this boilerplate and all FIXME comments. -# -# This is a template package file for Spack. We've put "FIXME" -# next to all the things you'll want to change. Once you've handled -# them, you can save this file and test your package like this: -# -# spack install agios -# -# You can edit this file again by typing: -# -# spack edit agios -# -# See the Spack documentation for more information on packaging. -# ---------------------------------------------------------------------------- - -from spack.package import * - - -class Agios(CMakePackage): - """AGIOS: an I/O request scheduling library at file level.""" - - - homepage = 'https://github.com/francielizanon/agios' - url = 'https://github.com/jeanbez/agios/archive/refs/tags/v1.0.tar.gz' - git = 'https://github.com/francielizanon/agios.git' - - version('latest', branch='development') - version('1.0', sha256='e8383a6ab0180ae8ba9bb2deb1c65d90c00583c3d6e77c70c415de8a98534efd') - - # general dependencies - depends_on('cmake@3.5:', type='build') - depends_on('libconfig') diff --git a/spack/packages/scord/package.py b/spack/packages/scord/package.py index af76f69a00451b276ee3f63ec76e91f1360cf13f..53616ca2417f09a2e387dbc030180524b62df4df 100644 --- a/spack/packages/scord/package.py +++ b/spack/packages/scord/package.py @@ -86,7 +86,6 @@ class Scord(CMakePackage): depends_on("mochi-margo@0.9.8", when='@0.2.0:') depends_on("mochi-thallium@0.10.1", when='@0.2.0:') depends_on("boost@1.71 +program_options", when='@0.2.0:') - depends_on("agios@latest", when='@0.2.0:') depends_on("redis-plus-plus@1.3.3:", when='@0.2.0:') with when("@0.2.0: +ofi"): diff --git a/src/scord/scord.cpp b/src/scord/scord.cpp index 5d87e3e5fce8abe06eeea62d3026cfec41119a86..f4cbdac69aeaadd907c6410a29e944fa14439abf 100644 --- a/src/scord/scord.cpp +++ b/src/scord/scord.cpp @@ -34,7 +34,6 @@ #include "rpc_server.hpp" #include "defaults.hpp" -#include #include #include