Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cdo
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor 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
mpim-sw
cdo
Commits
7f8ba8ea
Commit
7f8ba8ea
authored
8 years ago
by
Ralf Mueller
Browse files
Options
Downloads
Patches
Plain Diff
remove defaultCompilers; always use CC from ~/.rake.json
parent
5622c202
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.rake.json
+11
-7
11 additions, 7 deletions
.rake.json
Rakefile
+4
-6
4 additions, 6 deletions
Rakefile
with
15 additions
and
13 deletions
.rake.json
+
11
−
7
View file @
7f8ba8ea
{
"hosts"
:
{
"thunder"
:
{
"hostname"
:
"thunder5.zmaw.de"
,
"dir"
:
"/scratch/mpi/CC/mh0287/users/m300064/builds/remote"
"dir"
:
"/scratch/mpi/CC/mh0287/users/m300064/builds/remote"
,
"CC"
:
[
"icpc"
,
"icc"
,
"clang"
,
"clang++"
,
"gcc"
,
"g++"
]
},
"luthien"
:
{
"hostname"
:
"localhost"
,
...
...
@@ -37,22 +38,25 @@
"builders"
:
{
"localCLANG_3.8_Debug"
:
{
"hostname"
:
"luthien"
,
"CC"
:
"clang"
,
"configureCall"
:
"/home/ram/src/cdo/configure --with-netcdf CC=clang CFLAGS='-g -O0'"
,
"configureCall"
:
"/home/ram/src/cdo/configure --with-netcdf --disable-openmp CC=clang CXX=clang++ CFLAGS='-g -O0'"
,
"makeCall"
:
"make -j 12"
,
"sync"
:
false
},
"localCLANG++_3.8_Debug"
:
{
"hostname"
:
"luthien"
,
"CC"
:
"clang"
,
"configureCall"
:
"/home/ram/src/cdo/configure --with-netcdf --enable-cxx CC=clang CXX=clang++ CFLAGS='-g -O0'"
,
"configureCall"
:
"/home/ram/src/cdo/configure --with-netcdf --disable-openmp --enable-cxx CC=clang CXX=clang++ CFLAGS='-g -O0'"
,
"makeCall"
:
"make -j 12"
,
"sync"
:
false
},
"mpipcCLANG"
:
{
"hostname"
:
"mpipc"
,
"CC"
:
"clang"
,
"configureCall"
:
"./configure --with-netcdf=--with-netcdf=/sw/squeeze-x64/netcdf-4.2-static --disable-openmp CC=clang CFLAGS='-g -O2'"
,
"configureCall"
:
"./configure --with-netcdf=/sw/squeeze-x64/netcdf-4.2-static --disable-openmp CC=clang CFLAGS='-g -O2'"
,
"makeCall"
:
"make -j 12"
,
"sync"
:
true
},
"localGCCInSourceNoOpenmp"
:
{
"hostname"
:
"luthien"
,
"configureCall"
:
"./configure --disable-openmp CC=gcc CFLAGS='-g -O2'"
,
"makeCall"
:
"make -j 12"
,
"sync"
:
true
}
...
...
This diff is collapsed.
Click to expand it.
Rakefile
+
4
−
6
View file @
7f8ba8ea
...
...
@@ -17,8 +17,6 @@ end
# get setup from the environment
@debug
=
true
# == Rake.verbose ? true : false
@user
=
ENV
[
'USER'
]
# basic compilers handled by the default configuration: ./config/default
@defaultCompilers
=
%w[icpc icc clang clang++ gcc g++]
# default configure call
@defautConfigureCall
=
lambda
{
|
cc
|
"./config/default CC=
#{
cc
}
"
}
# }}}
...
...
@@ -205,9 +203,9 @@ end
# constuct builders out of user configuration {{{ ==============================
Builder
=
Struct
.
new
(
:host
,
:hostname
,
:username
,
:compiler
,
:targetDir
,
:configureCall
,
:isLocal?
)
# 1) construct builders from host configuration
# this is what config/default should be able to handle
@userConfig
[
"hosts"
].
each
{
|
host
,
config
|
compilers
=
config
.
has_key?
(
'CC'
)
?
config
[
'CC'
]
:
@defaultCompilers
compilers
.
each
{
|
cc
|
config
[
'CC'
].
each
{
|
cc
|
builder
=
Builder
.
new
(
host
,
config
[
"hostname"
],
(
'localhost'
==
config
[
'hostname'
])
\
...
...
@@ -217,7 +215,7 @@ Builder = Struct.new(:host,:hostname,:username,:compiler,:targetDir,:configureCa
:
@userConfig
[
"remoteUser"
]),
cc
,
[
config
[
"dir"
],
cc
,
getBranchName
].
join
(
File
::
SEPARATOR
),
@defautConfigureCall
[
cc
]
,
"./config/default CC=
#{
cc
}
"
,
config
[
"hostname"
]
==
'localhost'
)
builder2task
(
builder
)
}
...
...
@@ -232,7 +230,7 @@ Builder = Struct.new(:host,:hostname,:username,:compiler,:targetDir,:configureCa
:
(
config
.
has_key?
(
'username'
)
\
?
config
[
'username'
]
\
:
@userConfig
[
"remoteUser"
]),
config
[
"CC"
],
''
,
# CC can be empty here, because it should be set by the given configureCall
[
@userConfig
[
'hosts'
][
config
[
'hostname'
]][
'dir'
],
builderName
,
getBranchName
].
join
(
File
::
SEPARATOR
),
config
[
'configureCall'
],
(
'localhost'
==
config
[
'hostname'
]
\
...
...
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