Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gekkofs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Auer
gekkofs
Commits
1a884701
Commit
1a884701
authored
4 years ago
by
Ramon Nou
Browse files
Options
Downloads
Plain Diff
Merge branch '32-replace-margo-with-mercury-in-client-code' into HEAD
parents
0155657c
c930e4b3
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scripts/dl_dep.sh
+8
-6
8 additions, 6 deletions
scripts/dl_dep.sh
src/client/preload_util.cpp
+16
-2
16 additions, 2 deletions
src/client/preload_util.cpp
with
24 additions
and
8 deletions
scripts/dl_dep.sh
+
8
−
6
View file @
1a884701
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/client/preload_util.cpp
+
16
−
2
View file @
1a884701
...
...
@@ -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
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment