-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Proper commit checkout for terra. Check for gcc version (we need 4.9).
- Loading branch information
Showing
1 changed file
with
13 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,9 @@ | |
|
||
# Setting up the environment to build everything - download packages, build them, etc. | ||
|
||
# Check for gcc version. | ||
(gcc -v |& egrep "^gcc version 4.9") || (echo "needs gcc 4.9"; exit 1) | ||
|
||
# Bolierplate reduction. | ||
function clonepull { | ||
git clone $1 $2 || (cd $2 ; git pull) || exit 1 | ||
|
@@ -54,10 +57,14 @@ export GASNET_BIN="$GASNET_ROOT/bin" | |
# -- Terra --------------------------------------------------------------------- | ||
# Terra also unavailable on cluster. | ||
|
||
clonepull https://github.com/zdevito/terra.git terra | ||
git clone https://github.com/zdevito/terra.git terra # won't pull for a while. | ||
|
||
cd terra | ||
|
||
# Known good commit. | ||
git checkout c501af43915 | ||
|
||
|
||
make all || exit 1 | ||
cd .. | ||
|
||
|
@@ -66,13 +73,15 @@ export TERRA_DIR=$BUILDDIR/terra/release | |
# -- Legion -------------------------------------------------------------------- | ||
# We will build Legion by compiling one of the applications. | ||
|
||
clonepull [email protected]:SKA-ScienceDataProcessor/legion.git Legion | ||
git clone [email protected]:SKA-ScienceDataProcessor/legion.git Legion | ||
cd Legion | ||
git pull origin master | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. |
||
git checkout -b master | ||
cd .. | ||
|
||
# Go to Regent place. | ||
cd Legion/language | ||
|
||
sh | ||
|
||
# Running the installation, enabling the GASnet. | ||
# TODO: optionally enable CUDA. | ||
CONDUIT=udp ./install.py --with-terra=$TERRA_DIR --gasnet || exit 1 | ||
|
git pull origin master
mergesorigin/master
into current branch (which isstable
for this repo).Seems this is not what you actually want to do.
To switch branch use
git checkout master
(without-b
).Or you can
git clone --branch master <url> <dir>
to clone and checkout master.