Changeset 13336

Timestamp:

09/12/12 09:01:36 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed from MatlabFuncs import *, which was producing the following error message: 'SyntaxWarning: import * only allowed at module level'

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• runme.m (modified) (7 diffs)
• runme.py (modified) (6 diffs)

issm/trunk-jpl/test/NightlyRun/runme.m

@@ -35 +35 @@
 
 %Check inputs
-% {{{1
+% {{{
 if nargout>1
         help runme
@@ -46 +46 @@
 
 %Process options
-%GET benchmark {{{1
+%GET benchmark {{{
 benchmark=getfieldvalue(options,'benchmark','nightly');
 if ~ismember(benchmark,{'all','nightly','ismip','eismint','thermal','mesh','validation','tranforcing','adolc'})
@@ -53 +53 @@
 end
 % }}}
-%GET procedure {{{1
+%GET procedure {{{
 procedure=getfieldvalue(options,'procedure','check');
 if ~ismember(procedure,{'check','update'})
@@ -60 +60 @@
 end
 % }}}
-%GET output {{{1
+%GET output {{{
 output=getfieldvalue(options,'output','none');
 if ~ismember(output,{'nightly','daily','none'})
@@ -67 +67 @@
 end
 % }}}
-%GET RANK and NUMPROCS for mutlithreaded runs  {{{1
+%GET RANK and NUMPROCS for mutlithreaded runs  {{{
 rank=getfieldvalue(options,'rank',1);
 numprocs=getfieldvalue(options,'numprocs',1);
 if (numprocs<rank), numprocs=1; end
 % }}}
-%GET ids  {{{1
+%GET ids  {{{
 flist=dir;%use dir, as it seems to act OS independent
 list_ids=[];
@@ -88 +88 @@
 test_ids=intersect(test_ids,list_ids);
 % }}}
-%GET exclude {{{1
+%GET exclude {{{
 exclude_ids=getfieldvalue(options,'exclude',[]);
 exclude_ids=[exclude_ids];
@@ -94 +94 @@
 test_ids(pos)=[];
 % }}}
-%Process Ids according to benchmarks{{{1
+%Process Ids according to benchmarks{{{
 if strcmpi(benchmark,'nightly'),
         test_ids=intersect(test_ids,[1:999]);

issm/trunk-jpl/test/NightlyRun/runme.py

@@ -42 +42 @@
         from parallelrange import parallelrange
         from IdToName import IdToName
-        from MatlabFuncs import *
+        from MatlabFuncs import strcmpi
+        from MatlabFuncs import ismember
 
         #Get ISSM_DIR variable
         ISSM_DIR=os.environ['ISSM_DIR']
-        print 'ISSM_DIR =',ISSM_DIR
 
         #Process options
-        #GET benchmark {{{1
+        #GET benchmark {{{
         if not ismember(benchmark,['all','nightly','ismip','eismint','thermal','mesh','validation','tranforcing']):
                 print "runme warning: benchmark '%s' not supported, defaulting to test 'nightly'." % benchmark
                 benchmark='nightly'
         # }}}
-        #GET procedure {{{1
+        #GET procedure {{{
         if not ismember(procedure,['check','update']):
                 print "runme warning: procedure '%s' not supported, defaulting to test 'check'." % procedure
                 procedure='check'
         # }}}
-        #GET output {{{1
+        #GET output {{{
         if not ismember(output,['nightly','daily','none']):
                 print "runme warning: output '%s' not supported, defaulting to test 'none'." % output
                 output='none'
         # }}}
-        #GET RANK and NUMPROCS for multithreaded runs {{{1
+        #GET RANK and NUMPROCS for multithreaded runs {{{
         if (numprocs<rank):
                 numprocs=1
         # }}}
-
-        print 'id =',id
-        print 'exclude =',exclude
-        print 'benchmark =',benchmark
-        print 'procedure =',procedure
-        print 'output =',output
-        print 'rank =',rank
-        print 'numprocs =',numprocs
-
-        #GET ids  {{{1
+        #GET ids  {{{
         flist=glob.glob('test*.py')    #File name must start with 'test' and must end by '.py' and must be different than 'test.py'
         list_ids=[int(file[4:-3]) for file in flist if not file == 'test.py']    #Keep test id only (skip 'test' and '.py')
-        print 'list_ids =',list_ids
+        #print 'list_ids =',list_ids
 
         i1,i2=parallelrange(rank,numprocs,len(list_ids))    #Get tests for this cpu only
         list_ids=list_ids[i1:i2+1]
-        print 'list_ids after parallelrange =',list_ids
+        #print 'list_ids after parallelrange =',list_ids
 
         if id:
@@ -94 +85 @@
         else:
                 test_ids=set(list_ids)
-#       print 'test_ids after list =',test_ids
-        # }}}
-
-        #GET exclude {{{1
+        #print 'test_ids after list =',test_ids
+        # }}}
+        #GET exclude {{{
         if exclude:
                 if isinstance(exclude,list):
@@ -106 +96 @@
 #       print 'test_ids after exclude =',test_ids
         # }}}
-
-        #Process Ids according to benchmarks {{{1
+        #Process Ids according to benchmarks {{{
         if   strcmpi(benchmark,'nightly'):
                 test_ids=test_ids.intersection(set(range(1,1000)))
@@ -122 +111 @@
         elif strcmpi(benchmark,'tranforcing'):
                 test_ids=test_ids.intersection(set(range(1501,1503)))
-#       print 'test_ids after benchmark =',test_ids
+        #print 'test_ids after benchmark =',test_ids
         test_ids=list(test_ids)
         test_ids.sort()
-        print 'test_ids after sort =',test_ids
+        #print 'test_ids after sort =',test_ids
         # }}}
 
@@ -248 +237 @@
         return
 
+import argparse
 if __name__ == '__main__':
         if 'PYTHONSTARTUP' in os.environ:
                 PYTHONSTARTUP=os.environ['PYTHONSTARTUP']
-                print 'PYTHONSTARTUP =',PYTHONSTARTUP
+                #print 'PYTHONSTARTUP =',PYTHONSTARTUP
                 if os.path.exists(PYTHONSTARTUP):
                         try:
@@ -260 +250 @@
                         print "PYTHONSTARTUP file '%s' does not exist." % PYTHONSTARTUP
 
-        import argparse
         parser = argparse.ArgumentParser(description='RUNME - test deck for ISSM nightly runs')
         parser.add_argument('-i','--id', nargs='*', type=int, help='followed by the list of ids requested', default=[])