Loading Conflict: This file was modified in the source branch, but removed in the target branch. Ask someone with write access to resolve it. hermes @ 6a91fbf2 Compare 609f3de4 to 6a91fbf2 Viewed Changes for external/hermes: 1 added line, 1 removed line. Original line number Diff line number Diff line Subproject commit 609f3de4902c276a9831681156f6a17fbf4ad9b4 Subproject commit 6a91fbf250911887a83edf3b333a2eaff1ecde7d Conflict: This file was modified in both the source and target branches. Ask someone with write access to resolve it. include/common/common_defs.hpp +9 −2 Viewed Changes for include/common/common_defs.hpp: 9 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -58,11 +58,18 @@ constexpr auto get_chunk_stat = "rpc_srv_chunk_stat"; } // namespace tag namespace protocol { constexpr auto ofi_psm2 = "ofi+psm2"; constexpr auto na_sm = "na+sm"; constexpr auto ofi_sockets = "ofi+sockets"; constexpr auto ofi_tcp = "ofi+tcp"; constexpr auto ofi_verbs = "ofi+verbs"; constexpr auto na_sm = "na+sm"; constexpr auto ofi_psm2 = "ofi+psm2"; constexpr auto ucx_all = "ucx+all"; constexpr auto ucx_tcp = "ucx+tcp"; constexpr auto ucx_rc = "ucx+rc"; constexpr auto ucx_ud = "ucx+ud"; constexpr auto all_remote_protocols = {ofi_sockets, ofi_tcp, ofi_verbs, ofi_psm2, ucx_all, ucx_tcp, ucx_rc, ucx_ud}; } // namespace protocol } // namespace gkfs::rpc Loading scripts/profiles/0.9.2_rc1/install/agios.install 0 → 100644 +57 −0 Viewed Changes for scripts/profiles/0.9.2_rc1/install/agios.install: 57 added lines, 0 removed lines. Original line number Diff line number Diff line ################################################################################ # 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). # # # # 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 <https://www.gnu.org/licenses/>. # # # # SPDX-License-Identifier: GPL-3.0-or-later # ################################################################################ # vi: ft=bash ################################################################################ ## 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 ################################################################################ pkg_install() { ID="agios" CURR="${SOURCE_DIR}/${ID}" prepare_build_dir "${CURR}" cd "${CURR}/build" ${CMAKE} -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" .. make install } pkg_check() { : } scripts/profiles/0.9.2_rc1/install/argobots.install 0 → 100644 +60 −0 Viewed Changes for scripts/profiles/0.9.2_rc1/install/argobots.install: 60 added lines, 0 removed lines. Original line number Diff line number Diff line ################################################################################ # 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). # # # # 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 <https://www.gnu.org/licenses/>. # # # # SPDX-License-Identifier: GPL-3.0-or-later # ################################################################################ # vi: ft=bash ################################################################################ ## 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 ################################################################################ pkg_install() { ID="argobots" CURR="${SOURCE_DIR}/${ID}" prepare_build_dir "${CURR}" cd "${CURR}" ./autogen.sh cd "${CURR}/build" ../configure --prefix="${INSTALL_DIR}" --enable-perf-opt --disable-checks make -j"${CORES}" make install } pkg_check() { make check } scripts/profiles/0.9.2_rc1/install/capstone.install 0 → 100644 +57 −0 Viewed Changes for scripts/profiles/0.9.2_rc1/install/capstone.install: 57 added lines, 0 removed lines. Original line number Diff line number Diff line ################################################################################ # 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). # # # # 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 <https://www.gnu.org/licenses/>. # # # # SPDX-License-Identifier: GPL-3.0-or-later # ################################################################################ # vi: ft=bash ################################################################################ ## 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 ################################################################################ pkg_install() { ID="capstone" CURR="${SOURCE_DIR}/${ID}" prepare_build_dir "${CURR}" cd "${CURR}/build" ${CMAKE} -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" -DCMAKE_BUILD_TYPE:STRING=Release .. make -j"${CORES}" install } pkg_check() { : } Loading
Conflict: This file was modified in the source branch, but removed in the target branch. Ask someone with write access to resolve it. hermes @ 6a91fbf2 Compare 609f3de4 to 6a91fbf2 Viewed Changes for external/hermes: 1 added line, 1 removed line. Original line number Diff line number Diff line Subproject commit 609f3de4902c276a9831681156f6a17fbf4ad9b4 Subproject commit 6a91fbf250911887a83edf3b333a2eaff1ecde7d
Conflict: This file was modified in both the source and target branches. Ask someone with write access to resolve it. include/common/common_defs.hpp +9 −2 Viewed Changes for include/common/common_defs.hpp: 9 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -58,11 +58,18 @@ constexpr auto get_chunk_stat = "rpc_srv_chunk_stat"; } // namespace tag namespace protocol { constexpr auto ofi_psm2 = "ofi+psm2"; constexpr auto na_sm = "na+sm"; constexpr auto ofi_sockets = "ofi+sockets"; constexpr auto ofi_tcp = "ofi+tcp"; constexpr auto ofi_verbs = "ofi+verbs"; constexpr auto na_sm = "na+sm"; constexpr auto ofi_psm2 = "ofi+psm2"; constexpr auto ucx_all = "ucx+all"; constexpr auto ucx_tcp = "ucx+tcp"; constexpr auto ucx_rc = "ucx+rc"; constexpr auto ucx_ud = "ucx+ud"; constexpr auto all_remote_protocols = {ofi_sockets, ofi_tcp, ofi_verbs, ofi_psm2, ucx_all, ucx_tcp, ucx_rc, ucx_ud}; } // namespace protocol } // namespace gkfs::rpc Loading
scripts/profiles/0.9.2_rc1/install/agios.install 0 → 100644 +57 −0 Viewed Changes for scripts/profiles/0.9.2_rc1/install/agios.install: 57 added lines, 0 removed lines. Original line number Diff line number Diff line ################################################################################ # 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). # # # # 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 <https://www.gnu.org/licenses/>. # # # # SPDX-License-Identifier: GPL-3.0-or-later # ################################################################################ # vi: ft=bash ################################################################################ ## 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 ################################################################################ pkg_install() { ID="agios" CURR="${SOURCE_DIR}/${ID}" prepare_build_dir "${CURR}" cd "${CURR}/build" ${CMAKE} -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" .. make install } pkg_check() { : }
scripts/profiles/0.9.2_rc1/install/argobots.install 0 → 100644 +60 −0 Viewed Changes for scripts/profiles/0.9.2_rc1/install/argobots.install: 60 added lines, 0 removed lines. Original line number Diff line number Diff line ################################################################################ # 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). # # # # 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 <https://www.gnu.org/licenses/>. # # # # SPDX-License-Identifier: GPL-3.0-or-later # ################################################################################ # vi: ft=bash ################################################################################ ## 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 ################################################################################ pkg_install() { ID="argobots" CURR="${SOURCE_DIR}/${ID}" prepare_build_dir "${CURR}" cd "${CURR}" ./autogen.sh cd "${CURR}/build" ../configure --prefix="${INSTALL_DIR}" --enable-perf-opt --disable-checks make -j"${CORES}" make install } pkg_check() { make check }
scripts/profiles/0.9.2_rc1/install/capstone.install 0 → 100644 +57 −0 Viewed Changes for scripts/profiles/0.9.2_rc1/install/capstone.install: 57 added lines, 0 removed lines. Original line number Diff line number Diff line ################################################################################ # 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). # # # # 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 <https://www.gnu.org/licenses/>. # # # # SPDX-License-Identifier: GPL-3.0-or-later # ################################################################################ # vi: ft=bash ################################################################################ ## 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 ################################################################################ pkg_install() { ID="capstone" CURR="${SOURCE_DIR}/${ID}" prepare_build_dir "${CURR}" cd "${CURR}/build" ${CMAKE} -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" -DCMAKE_BUILD_TYPE:STRING=Release .. make -j"${CORES}" install } pkg_check() { : }