[Swift-commit] r6522 - in SwiftApps/magic-square: . beagle mcs src
davidk at ci.uchicago.edu
davidk at ci.uchicago.edu
Thu May 30 14:15:05 CDT 2013
Author: davidk
Date: 2013-05-30 14:15:05 -0500 (Thu, 30 May 2013)
New Revision: 6522
Added:
SwiftApps/magic-square/beagle/
SwiftApps/magic-square/beagle/bin/
SwiftApps/magic-square/beagle/clean.sh
SwiftApps/magic-square/beagle/degree.dat
SwiftApps/magic-square/beagle/hwsq.sh
SwiftApps/magic-square/beagle/magic-square.swift
SwiftApps/magic-square/beagle/sites.xml
SwiftApps/magic-square/beagle/tc.data
SwiftApps/magic-square/mcs/
SwiftApps/magic-square/mcs/degree.dat
SwiftApps/magic-square/mcs/run.sh
SwiftApps/magic-square/src/
SwiftApps/magic-square/src/Makefile
SwiftApps/magic-square/src/hwsq.m
SwiftApps/magic-square/src/myf1.m
Removed:
SwiftApps/magic-square/clean.sh
SwiftApps/magic-square/hwsq.m
SwiftApps/magic-square/hwsq.sh
SwiftApps/magic-square/magic-square.swift
SwiftApps/magic-square/myf1.m
SwiftApps/magic-square/sites.xml
SwiftApps/magic-square/tc.data
Log:
Set up different directories for beagle and mcs, to point to the correct locations of the matlab compiler runtime
Copied: SwiftApps/magic-square/beagle/clean.sh (from rev 6521, SwiftApps/magic-square/clean.sh)
===================================================================
--- SwiftApps/magic-square/beagle/clean.sh (rev 0)
+++ SwiftApps/magic-square/beagle/clean.sh 2013-05-30 19:15:05 UTC (rev 6522)
@@ -0,0 +1 @@
+rm -rf *.log *.rlog *.d *.kml *.swiftx *.dat
Added: SwiftApps/magic-square/beagle/degree.dat
===================================================================
--- SwiftApps/magic-square/beagle/degree.dat (rev 0)
+++ SwiftApps/magic-square/beagle/degree.dat 2013-05-30 19:15:05 UTC (rev 6522)
@@ -0,0 +1 @@
+5
Copied: SwiftApps/magic-square/beagle/hwsq.sh (from rev 6521, SwiftApps/magic-square/hwsq.sh)
===================================================================
--- SwiftApps/magic-square/beagle/hwsq.sh (rev 0)
+++ SwiftApps/magic-square/beagle/hwsq.sh 2013-05-30 19:15:05 UTC (rev 6522)
@@ -0,0 +1 @@
+/lustre/beagle/davidk/magic-square/bin/run_hwsq.sh /soft/matlab/7.13 "$@"
Copied: SwiftApps/magic-square/beagle/magic-square.swift (from rev 6521, SwiftApps/magic-square/magic-square.swift)
===================================================================
--- SwiftApps/magic-square/beagle/magic-square.swift (rev 0)
+++ SwiftApps/magic-square/beagle/magic-square.swift 2013-05-30 19:15:05 UTC (rev 6522)
@@ -0,0 +1,16 @@
+type file;
+
+app (file outdata) hwsq (file indata, int factor)
+{
+ runhwsq @indata @outdata factor;
+}
+
+file degreeData<"degree.dat">;
+
+int factors[] = [0:9];
+file squareMats[] <simple_mapper; prefix="sqmat.",suffix=".dat">;
+
+foreach f, i in factors {
+ squareMats[i] = hwsq (degreeData, f);
+}
+
Copied: SwiftApps/magic-square/beagle/sites.xml (from rev 6521, SwiftApps/magic-square/sites.xml)
===================================================================
--- SwiftApps/magic-square/beagle/sites.xml (rev 0)
+++ SwiftApps/magic-square/beagle/sites.xml 2013-05-30 19:15:05 UTC (rev 6522)
@@ -0,0 +1,9 @@
+<config>
+ <pool handle="localhost">
+ <execution provider="coaster" jobmanager="local:local"/>
+ <profile namespace="karajan" key="jobThrottle">0</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <filesystem provider="local"/>
+ <workdirectory>/lustre/beagle/davidk/swiftwork</workdirectory>
+ </pool>
+</config>
Copied: SwiftApps/magic-square/beagle/tc.data (from rev 6521, SwiftApps/magic-square/tc.data)
===================================================================
--- SwiftApps/magic-square/beagle/tc.data (rev 0)
+++ SwiftApps/magic-square/beagle/tc.data 2013-05-30 19:15:05 UTC (rev 6522)
@@ -0,0 +1 @@
+localhost runhwsq /lustre/beagle/davidk/magic-square/hwsq.sh
Deleted: SwiftApps/magic-square/clean.sh
===================================================================
--- SwiftApps/magic-square/clean.sh 2013-05-30 18:15:23 UTC (rev 6521)
+++ SwiftApps/magic-square/clean.sh 2013-05-30 19:15:05 UTC (rev 6522)
@@ -1 +0,0 @@
-rm -rf *.log *.rlog *.d *.kml *.swiftx *.dat
Deleted: SwiftApps/magic-square/hwsq.m
===================================================================
--- SwiftApps/magic-square/hwsq.m 2013-05-30 18:15:23 UTC (rev 6521)
+++ SwiftApps/magic-square/hwsq.m 2013-05-30 19:15:05 UTC (rev 6522)
@@ -1,7 +0,0 @@
-function m = hwsq(infile,outfile,fac)
-n = dlmread(infile)
-if ischar(fac)
- fac=str2num(fac);
-end
-m = myf1(n,fac)
-dlmwrite(outfile,m)
Deleted: SwiftApps/magic-square/hwsq.sh
===================================================================
--- SwiftApps/magic-square/hwsq.sh 2013-05-30 18:15:23 UTC (rev 6521)
+++ SwiftApps/magic-square/hwsq.sh 2013-05-30 19:15:05 UTC (rev 6522)
@@ -1 +0,0 @@
-/lustre/beagle/davidk/magic-square/bin/run_hwsq.sh /soft/matlab/7.13 "$@"
Deleted: SwiftApps/magic-square/magic-square.swift
===================================================================
--- SwiftApps/magic-square/magic-square.swift 2013-05-30 18:15:23 UTC (rev 6521)
+++ SwiftApps/magic-square/magic-square.swift 2013-05-30 19:15:05 UTC (rev 6522)
@@ -1,16 +0,0 @@
-type file;
-
-app (file outdata) hwsq (file indata, int factor)
-{
- runhwsq @indata @outdata factor;
-}
-
-file degreeData<"degree.dat">;
-
-int factors[] = [0:9];
-file squareMats[] <simple_mapper; prefix="sqmat.",suffix=".dat">;
-
-foreach f, i in factors {
- squareMats[i] = hwsq (degreeData, f);
-}
-
Added: SwiftApps/magic-square/mcs/degree.dat
===================================================================
--- SwiftApps/magic-square/mcs/degree.dat (rev 0)
+++ SwiftApps/magic-square/mcs/degree.dat 2013-05-30 19:15:05 UTC (rev 6522)
@@ -0,0 +1 @@
+5
Added: SwiftApps/magic-square/mcs/run.sh
===================================================================
--- SwiftApps/magic-square/mcs/run.sh (rev 0)
+++ SwiftApps/magic-square/mcs/run.sh 2013-05-30 19:15:05 UTC (rev 6522)
@@ -0,0 +1,3 @@
+#!/bin/bash -x
+
+swift -sites.file sites.xml -tc.file tc.data magic-square.swift
Property changes on: SwiftApps/magic-square/mcs/run.sh
___________________________________________________________________
Added: svn:executable
+ *
Deleted: SwiftApps/magic-square/myf1.m
===================================================================
--- SwiftApps/magic-square/myf1.m 2013-05-30 18:15:23 UTC (rev 6521)
+++ SwiftApps/magic-square/myf1.m 2013-05-30 19:15:05 UTC (rev 6522)
@@ -1,7 +0,0 @@
-function m = myf1(n,fac)
-
-if ischar(n)
- n=str2num(n);
-end
-g = magic(n)
-m = g * fac
Deleted: SwiftApps/magic-square/sites.xml
===================================================================
--- SwiftApps/magic-square/sites.xml 2013-05-30 18:15:23 UTC (rev 6521)
+++ SwiftApps/magic-square/sites.xml 2013-05-30 19:15:05 UTC (rev 6522)
@@ -1,9 +0,0 @@
-<config>
- <pool handle="localhost">
- <execution provider="coaster" jobmanager="local:local"/>
- <profile namespace="karajan" key="jobThrottle">0</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local"/>
- <workdirectory>/lustre/beagle/davidk/swiftwork</workdirectory>
- </pool>
-</config>
Added: SwiftApps/magic-square/src/Makefile
===================================================================
--- SwiftApps/magic-square/src/Makefile (rev 0)
+++ SwiftApps/magic-square/src/Makefile 2013-05-30 19:15:05 UTC (rev 6522)
@@ -0,0 +1,6 @@
+all: mpitest.c
+ cc -o mpitest mpitest.c
+ mkdir -p ../bin
+ cp mpitest ../bin
+ cp mpitest.sh ../bin
+
Copied: SwiftApps/magic-square/src/hwsq.m (from rev 6521, SwiftApps/magic-square/hwsq.m)
===================================================================
--- SwiftApps/magic-square/src/hwsq.m (rev 0)
+++ SwiftApps/magic-square/src/hwsq.m 2013-05-30 19:15:05 UTC (rev 6522)
@@ -0,0 +1,7 @@
+function m = hwsq(infile,outfile,fac)
+n = dlmread(infile)
+if ischar(fac)
+ fac=str2num(fac);
+end
+m = myf1(n,fac)
+dlmwrite(outfile,m)
Copied: SwiftApps/magic-square/src/myf1.m (from rev 6521, SwiftApps/magic-square/myf1.m)
===================================================================
--- SwiftApps/magic-square/src/myf1.m (rev 0)
+++ SwiftApps/magic-square/src/myf1.m 2013-05-30 19:15:05 UTC (rev 6522)
@@ -0,0 +1,7 @@
+function m = myf1(n,fac)
+
+if ischar(n)
+ n=str2num(n);
+end
+g = magic(n)
+m = g * fac
Deleted: SwiftApps/magic-square/tc.data
===================================================================
--- SwiftApps/magic-square/tc.data 2013-05-30 18:15:23 UTC (rev 6521)
+++ SwiftApps/magic-square/tc.data 2013-05-30 19:15:05 UTC (rev 6522)
@@ -1 +0,0 @@
-localhost runhwsq /lustre/beagle/davidk/magic-square/hwsq.sh
More information about the Swift-commit
mailing list