Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
common_bench
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
Container 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
EIC
benchmarks
common_bench
Commits
743ccd6b
Commit
743ccd6b
authored
1 year ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
fix: rm JUGGLER_INSTALL_PREFIX
parent
927f74a8
Branches
Branches containing commit
No related tags found
1 merge request
!70
fix: rm JUGGLER_INSTALL_PREFIX
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bin/env.sh
+3
-15
3 additions, 15 deletions
bin/env.sh
bin/print_env.sh
+0
-1
0 additions, 1 deletion
bin/print_env.sh
with
3 additions
and
16 deletions
bin/env.sh
+
3
−
15
View file @
743ccd6b
...
...
@@ -11,7 +11,6 @@
## - BENCHMARK_N_EVENTS: events processed by simulation/reconstruction
## - BENCHMARK_N_THREADS: number of threads/processes to spawn in parallel
## - BENCHMARK_RNG_SEED: random seed for the RNG
## - JUGGLER_INSTALL_PREFIX: location where Juggler (digi/recon) is installed
##
## It also defines the following additional variables for internally usage
## - LOCAL_PREFIX: prefix for packages installed during the benchmark
...
...
@@ -70,17 +69,6 @@ if [ ! -n "${BENCHMARK_RNG_SEED}" ]; then
fi
export
JUGGLER_RNG_SEED
=
${
BENCHMARK_RNG_SEED
}
## Install prefix for juggler, needed to locate the Juggler xenv files.
## Also used by the CI as install prefix for other packages where needed.
## You should not have to touch this. Note that for local usage a different
## prefix structure is automatically used.
if
[
!
-n
"
${
JUGGLER_INSTALL_PREFIX
}
"
]
;
then
export
JUGGLER_INSTALL_PREFIX
=
"/usr/local"
fi
## Ensure the juggler prefix is an absolute path
export
JUGGLER_INSTALL_PREFIX
=
`
realpath
${
JUGGLER_INSTALL_PREFIX
}
`
## Location of local data for pass data from job to job within pipeline.
## Not saved as artifacts.
## Local /scratch directory is presumed to be writable.
...
...
@@ -136,9 +124,9 @@ echo "LOCAL_DATA_PATH=${LOCAL_DATA_PATH}" >> .env
## =============================================================================
## Setup PATH and LD_LIBRARY_PATH to include our prefixes
echo
"Adding
JUGGLER_INSTALL_PREFIX and
LOCAL_PREFIX to PATH and LD_LIBRARY_PATH"
export
PATH
=
${
LOCAL_PREFIX
}
/bin:
${
JUGGLER_INSTALL_PREFIX
}
/bin:
${
PATH
}
export
LD_LIBRARY_PATH
=
${
LOCAL_PREFIX
}
/lib:
${
JUGGLER_INSTALL_PREFIX
}
/lib:
${
LD_LIBRARY_PATH
}
echo
"Adding LOCAL_PREFIX to PATH and LD_LIBRARY_PATH"
export
PATH
=
${
LOCAL_PREFIX
}
/bin:
${
PATH
}
export
LD_LIBRARY_PATH
=
${
LOCAL_PREFIX
}
/lib:
${
LD_LIBRARY_PATH
}
# Local field maps
mkdir
-p
${
LOCAL_DATA_PATH
}
/fieldmaps
...
...
This diff is collapsed.
Click to expand it.
bin/print_env.sh
+
0
−
1
View file @
743ccd6b
...
...
@@ -12,6 +12,5 @@ echo "BENCHMARK_RNG_SEED: ${BENCHMARK_RNG_SEED}"
echo
"JUGGLER_N_EVENTS:
${
JUGGLER_N_EVENTS
}
"
echo
"JUGGLER_N_THREADS:
${
JUGGLER_N_THREADS
}
"
echo
"JUGGLER_RNG_SEED:
${
JUGGLER_RNG_SEED
}
"
echo
"JUGGLER_INSTALL_PREFIX:
${
JUGGLER_INSTALL_PREFIX
}
"
echo
"LOCAL_PREFIX:
${
LOCAL_PREFIX
}
"
echo
"LOCAL_DATA_PATH:
${
LOCAL_DATA_PATH
}
"
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