Skip to content
Snippets Groups Projects
Commit 1a884701 authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch '32-replace-margo-with-mercury-in-client-code' into HEAD

parents 0155657c c930e4b3
No related branches found
No related tags found
No related merge requests found
......@@ -264,12 +264,14 @@ if [[ ( "${DEPENDENCY}" == "" ) || ( "${DEPENDENCY}" == "bmi" ) ]]; then
fi
# get libfabric
if [[ ( "${DEPENDENCY}" == "" ) || ( "${DEPENDENCY}" == "ofi" ) ]]; then
if [ "${NA_LAYER}" == "ofi" ] || [ "${NA_LAYER}" == "all" ]; then
# No need to get libfabric for mogon2 as it is already installed
if [[ ("${CLUSTER}" != "mogon2") ]]; then
wgetdeps "libfabric" "https://github.com/ofiwg/libfabric/releases/download/v1.7.2/libfabric-1.7.2.tar.gz" &
fi
if [ "${NA_LAYER}" == "ofi" ] || [ "${NA_LAYER}" == "all" ]; then
# getting specific libpsm2 version to compile into libfabric
if [[ ("${CLUSTER}" == "mogon2") ]]; then
wgetdeps "psm2" "https://github.com/intel/opa-psm2/archive/PSM2_11.2.77.tar.gz" &
fi
# No need to get libfabric for mogon2 as it is already installed
if [[ ("${CLUSTER}" != "mogon2") ]]; then
wgetdeps "libfabric" "https://github.com/ofiwg/libfabric/releases/download/v1.8.1rc1/libfabric-1.8.1rc1.tar.gz"
fi
fi
......
......@@ -25,6 +25,8 @@
#include <csignal>
#include <random>
#include <sys/sysmacros.h>
#include <sys/types.h>
#include <pwd.h>
using namespace std;
......@@ -143,8 +145,20 @@ hermes::endpoint lookup_endpoint(const std::string& uri,
void load_hosts() {
string hosts_file;
hosts_file = gkfs::env::get_var(gkfs::env::HOSTS_FILE, DEFAULT_HOSTS_FILE);
try {
hosts_file = gkfs::get_env_own("HOSTS_FILE");
} catch (const exception& e) {
char* homedir = NULL;
struct passwd *pw = getpwuid(getuid());
if (pw) {
homedir = pw->pw_dir;
hosts_file = string(homedir)+"/gkfs_hosts.txt"s;
}
CTX->log()->info("{}() Failed to get hosts file path"
" from environment, using default: '{}'",
__func__, DEFAULT_HOSTS_FILE);
hosts_file = DEFAULT_HOSTS_FILE;
}
vector<pair<string, string>> hosts;
try {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment