Skip to content

Commit d97fd8c

Browse files
author
Yadu Babuji
committed
Committing tested tutorial material from beagle
1 parent 98786f6 commit d97fd8c

File tree

6 files changed

+145
-52
lines changed

6 files changed

+145
-52
lines changed

‎swift-tutorial/part04/swift.properties

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,34 @@ site.local {
99
workdir=/tmp/$USER/swiftwork
1010
}
1111

12+
site.beagle {
13+
# jobManager=login4.beagle.ci.uchicago.edu:pbs
14+
jobManager=pbs
15+
jobQueue=development
16+
tasksPerWorker=8
17+
providerAttributes=pbs.aprun;pbs.mpp;depth=24
18+
initialScore=10000
19+
filesystem=local
20+
jobWalltime=00:10:00
21+
taskWalltime=00:02:00
22+
userHomeOverride=/lustre/beagle/$USER
23+
workDir=/lustre/beagle/$USER
24+
}
25+
26+
site.beagle-remote {
27+
jobManager=login4.beagle.ci.uchicago.edu:pbs
28+
jobQueue=development
29+
tasksPerWorker=8
30+
providerAttributes=pbs.aprun;pbs.mpp;depth=24
31+
initialScore=10000
32+
filesystem=local
33+
jobWalltime=00:10:00
34+
taskWalltime=00:02:00
35+
userHomeOverride=/lustre/beagle/$USER
36+
workDir=/lustre/beagle/$USER
37+
}
38+
39+
1240
site.osgconnect {
1341
jobmanager=condor
1442
filesystem=local
@@ -21,15 +49,13 @@ site.osgconnect {
2149
condor.+projectname=Swift
2250
}
2351

24-
app.osgconnect.bash=/bin/bash
25-
2652
site.cloud {
2753
taskWalltime=04:00:00
2854
initialScore=10000
2955
filesystem=local
3056
jobmanager=coaster-persistent:local:local:http://localhost:50010
3157
workerManager=passive
3258
taskThrottle=800
33-
workdir=/home/yadu/work
59+
workdir=/home/$USER/work
3460
}
3561

‎swift-tutorial/part04/swift.properties~

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎swift-tutorial/part05/swift.properties

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,40 @@ site.local {
99
workdir=/tmp/$USER/swiftwork
1010
}
1111

12+
site.beagle {
13+
# jobManager=login4.beagle.ci.uchicago.edu:pbs
14+
jobManager=pbs
15+
jobQueue=development
16+
tasksPerWorker=8
17+
providerAttributes=pbs.aprun;pbs.mpp;depth=24
18+
initialScore=10000
19+
filesystem=local
20+
jobWalltime=00:10:00
21+
taskWalltime=00:02:00
22+
userHomeOverride=/lustre/beagle/$USER
23+
workDir=/lustre/beagle/$USER
24+
}
25+
26+
site.beagle-remote {
27+
jobManager=login4.beagle.ci.uchicago.edu:pbs
28+
jobQueue=development
29+
tasksPerWorker=8
30+
providerAttributes=pbs.aprun;pbs.mpp;depth=24
31+
initialScore=10000
32+
filesystem=local
33+
jobWalltime=00:10:00
34+
taskWalltime=00:02:00
35+
userHomeOverride=/lustre/beagle/$USER
36+
workDir=/lustre/beagle/$USER
37+
}
38+
39+
1240
site.osgconnect {
1341
jobmanager=condor
1442
filesystem=local
1543
initialscore=10000
1644
taskWalltime=01:00:00
17-
workdir=/tmp/$USER/swiftwork
45+
workdir=/tmp/swiftwork
1846
maxJobs=2
1947
tasksPerWorker=5
2048
taskThrottle=50

‎swift-tutorial/part06/swift.properties

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,34 @@ site.local {
99
workdir=/tmp/$USER/swiftwork
1010
}
1111

12+
site.beagle {
13+
# jobManager=login4.beagle.ci.uchicago.edu:pbs
14+
jobManager=pbs
15+
jobQueue=development
16+
tasksPerWorker=8
17+
providerAttributes=pbs.aprun;pbs.mpp;depth=24
18+
initialScore=10000
19+
filesystem=local
20+
jobWalltime=00:10:00
21+
taskWalltime=00:02:00
22+
userHomeOverride=/lustre/beagle/$USER
23+
workDir=/lustre/beagle/$USER
24+
}
25+
26+
site.beagle-remote {
27+
jobManager=login4.beagle.ci.uchicago.edu:pbs
28+
jobQueue=development
29+
tasksPerWorker=8
30+
providerAttributes=pbs.aprun;pbs.mpp;depth=24
31+
initialScore=10000
32+
filesystem=local
33+
jobWalltime=00:10:00
34+
taskWalltime=00:02:00
35+
userHomeOverride=/lustre/beagle/$USER
36+
workDir=/lustre/beagle/$USER
37+
}
38+
39+
1240
site.osgconnect {
1341
jobmanager=condor
1442
filesystem=local
@@ -28,6 +56,6 @@ site.cloud {
2856
jobmanager=coaster-persistent:local:local:http://localhost:50010
2957
workerManager=passive
3058
taskThrottle=800
31-
workdir=/home/yadu/work
59+
workdir=/home/$USER/work
3260
}
3361

‎swift-tutorial/swift.properties

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,56 @@ site.local {
66
jobmanager=local
77
initialScore=10000
88
filesystem=local
9-
workdir=/tmp/swiftwork
9+
workdir=/tmp/$USER/swiftwork
10+
}
11+
12+
site.beagle {
13+
# jobManager=login4.beagle.ci.uchicago.edu:pbs
14+
jobManager=pbs
15+
jobQueue=development
16+
tasksPerWorker=8
17+
providerAttributes=pbs.aprun;pbs.mpp;depth=24
18+
initialScore=10000
19+
filesystem=local
20+
jobWalltime=00:10:00
21+
taskWalltime=00:02:00
22+
userHomeOverride=/lustre/beagle/$USER
23+
workDir=/lustre/beagle/$USER
1024
}
1125

26+
site.beagle-remote {
27+
jobManager=login4.beagle.ci.uchicago.edu:pbs
28+
jobQueue=development
29+
tasksPerWorker=8
30+
providerAttributes=pbs.aprun;pbs.mpp;depth=24
31+
initialScore=10000
32+
filesystem=local
33+
jobWalltime=00:10:00
34+
taskWalltime=00:02:00
35+
userHomeOverride=/lustre/beagle/$USER
36+
workDir=/lustre/beagle/$USER
37+
}
38+
39+
1240
site.osgconnect {
13-
jobmanager=login.osgconnect.net:condor
41+
jobmanager=condor
1442
filesystem=local
1543
initialscore=10000
1644
taskWalltime=01:00:00
1745
workdir=/tmp/swiftwork
18-
maxJobs=10
19-
maxNodesPerJob=2
46+
maxJobs=2
2047
tasksPerWorker=5
21-
taskThrottle=300
48+
taskThrottle=50
2249
condor.+projectname=Swift
2350
}
51+
52+
site.cloud {
53+
taskWalltime=04:00:00
54+
initialScore=10000
55+
filesystem=local
56+
jobmanager=coaster-persistent:local:local:http://localhost:50010
57+
workerManager=passive
58+
taskThrottle=800
59+
workdir=/home/$USER/work
60+
}
61+

‎swift-tutorial/test_all.sh

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11
#!/bin/bash
22

3-
for i in $(seq 1 1 5)
3+
4+
5+
SITES=('beagle' 'beagle-remote')
6+
for i in $(seq 4 1 6)
47
do
58
pushd .
69
echo "============================TESTING part0$i==========================="
710
cd part0$i
8-
swift p$i.swift
9-
if [[ $? == 0 ]]
10-
then
11-
echo "Cleaning up!"
12-
cleanup
13-
fi
11+
12+
for SITE in ${SITES[*]}
13+
do
14+
echo "Running on SITE : $SITE"
15+
swift p$i.swift -site=$SITE
16+
if [[ $? == 0 ]]
17+
then
18+
echo "Cleaning up!"
19+
cleanup
20+
fi
21+
done
1422
echo -e "\n\n"
1523
popd
1624
done

0 commit comments

Comments
 (0)