Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
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
RadioObservatory
LOFAR
Commits
6b8988ad
Commit
6b8988ad
authored
4 years ago
by
Jorrit Schaap
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of git.astron.nl:ro/lofar
parents
17ed411b
a4e8c47b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Docker/lofar-base/Dockerfile.tmpl
+14
-1
14 additions, 1 deletion
Docker/lofar-base/Dockerfile.tmpl
with
14 additions
and
1 deletion
Docker/lofar-base/Dockerfile.tmpl
+
14
−
1
View file @
6b8988ad
...
...
@@ -62,7 +62,20 @@ ENV CASACORE_VERSION=v3.1.0 \
# Allow to specify the number of cpus as --build-arg.
#
ARG J=6
ENV J=${J} CXX_FLAGS="--std=c++11 -W -Wall -Woverloaded-virtual -Wno-unknown-pragmas -D_GLIBCXX_USE_CXX11_ABI=${CXX_ABI} -O3 -march=haswell"
ENV J=${J}
# Allow to overwrite the default CXX_FLAGS settings for code compilation
# by specifying --build-args CXX_FLAGS="blah blah"
ARG CXX_FLAGS="--std=c++11 -W -Wall -Woverloaded-virtual -Wno-unknown-pragmas -D_GLIBCXX_USE_CXX11_ABI=${CXX_ABI} -O3"
# Allow to overwrite the CPU optimisation default setting by specifying
# --build-arg CPU_OPTIMISATION="native"
ARG CPU_OPTIMISATION="haswell"
ENV CPU_OPTIMISATION="-march=${CPU_OPTIMISATION}"
# Combine CXX_FLAGS and CPU_OPTIMISATION
ENV CXX_FLAGS="${CXX_FLAGS} ${CPU_OPTIMISATION}"
#
# Base and runtime dependencies
...
...
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