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
39c14811
Commit
39c14811
authored
1 year ago
by
Whitney Armstrong
Browse files
Options
Downloads
Patches
Plain Diff
DETECTOR_PATH now $LOCAL_PREFIX/share/$DETECTOR
parent
50f7515c
No related branches found
No related tags found
1 merge request
!78
DETECTOR_PATH now $LOCAL_PREFIX/share/$DETECTOR
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bin/build_detector.sh
+2
-2
2 additions, 2 deletions
bin/build_detector.sh
bin/env.sh
+4
-4
4 additions, 4 deletions
bin/env.sh
with
6 additions
and
6 deletions
bin/build_detector.sh
+
2
−
2
View file @
39c14811
...
@@ -11,9 +11,9 @@
...
@@ -11,9 +11,9 @@
## - DETECTOR: the detector package we want to use for this benchmark
## - DETECTOR: the detector package we want to use for this benchmark
## - LOCAL_PREFIX: location where local packages should be installed
## - LOCAL_PREFIX: location where local packages should be installed
## - LOCAL_DATA_PATH: local storage for pipeline jobs
## - LOCAL_DATA_PATH: local storage for pipeline jobs
## - DETECTOR_PREFIX: prefix for the detector definition
s
## - DETECTOR_PREFIX: prefix for the detector definition
repositories
## - DETECTOR_PATH: full path for the detector definitions
## - DETECTOR_PATH: full path for the detector definitions
## this is the same as ${
DETECTOR
_PREFIX}/${DETECTOR}
## this is the same as ${
LOCAL
_PREFIX}/
share/
${DETECTOR}
if
[
-n
"
${
LOCAL_PREFIX
}
"
]
;
then
if
[
-n
"
${
LOCAL_PREFIX
}
"
]
;
then
source
.local/bin/env.sh
source
.local/bin/env.sh
...
...
This diff is collapsed.
Click to expand it.
bin/env.sh
+
4
−
4
View file @
39c14811
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
## - LOCAL_PREFIX: prefix for packages installed during the benchmark
## - LOCAL_PREFIX: prefix for packages installed during the benchmark
## - LOCAL_DATA_PATH: local storage for pipeline jobs
## - LOCAL_DATA_PATH: local storage for pipeline jobs
## - DETECTOR_PREFIX: prefix for the detector definitions
## - DETECTOR_PREFIX: prefix for the detector definitions
## - DETECTOR_PATH:
actual path with the
detector definitions
## - DETECTOR_PATH:
root path to locally installed
detector definition
xml file
s
##
##
## Finally, it makes sure LOCAL_PREFIX and JUGGLER_PREFIX are added to PATH
## Finally, it makes sure LOCAL_PREFIX and JUGGLER_PREFIX are added to PATH
## and LD_LIBRARY_PATH
## and LD_LIBRARY_PATH
...
@@ -121,12 +121,12 @@ LOCAL_PREFIX=".local"
...
@@ -121,12 +121,12 @@ LOCAL_PREFIX=".local"
mkdir
-p
"
${
LOCAL_PREFIX
}
"
mkdir
-p
"
${
LOCAL_PREFIX
}
"
export
LOCAL_PREFIX
=
`
realpath
${
LOCAL_PREFIX
}
`
export
LOCAL_PREFIX
=
`
realpath
${
LOCAL_PREFIX
}
`
## detector prefix: prefix for the detector definitions
## detector prefix: prefix for the detector definition
repositorie
s
export
DETECTOR_PREFIX
=
"
${
LOCAL_PREFIX
}
/detector"
export
DETECTOR_PREFIX
=
"
${
LOCAL_PREFIX
}
/detector"
mkdir
-p
${
DETECTOR_PREFIX
}
mkdir
-p
${
DETECTOR_PREFIX
}
## detector path:
actual
detector definition
path
## detector path:
root path to locally installed
detector definition
xml files
export
DETECTOR_PATH
=
"
${
DETECTOR
_PREFIX
}
/
${
DETECTOR
}
"
export
DETECTOR_PATH
=
"
${
LOCAL
_PREFIX
}
/
share/
${
DETECTOR
}
"
## build dir for ROOT to put its binaries etc.
## build dir for ROOT to put its binaries etc.
export
ROOT_BUILD_DIR
=
$LOCAL_PREFIX
/root_build
export
ROOT_BUILD_DIR
=
$LOCAL_PREFIX
/root_build
...
...
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