Changeset 529 for trunk

Timestamp:

Sep 21, 2006, 7:08:49 PM (18 years ago)

Author:

dkearney

Message:

adjustments to configure and makefiles to include the new tcl units bindings.
few more adjustments to rappture queues for condor

Location:

trunk

Files:

• Makefile.in (modified) (3 diffs)
• configure (modified) (3 diffs)
• configure.in (modified) (1 diff)
• python/Rappture/queue.py (modified) (6 diffs)

trunk/Makefile.in

@@ -65 +65 @@
         cd tcl; @prefix@/bin/tclsh install.tcl
 #       cd tcl; @TCLSH@ install.tcl
+        cd src/tcl; make install; cd -
 
 # matlab bindings
@@ -122 +123 @@
         cd src/matlab; make clean; cd -;
         cd src/octave; make clean; cd -;
+        cd src/tcl; make distclean; cd -;
 
 distclean:
@@ -134 +136 @@
         cd src/matlab; make distclean; cd -;
         cd src/octave; make distclean; cd -;
+        cd src/tcl; make distclean; cd -;
         cd test; make distclean; cd -;
         rm gui/apps/rappture;

trunk/configure

@@ -312 +312 @@
 
 ac_subdirs_all="$ac_subdirs_all gui"
+ac_subdirs_all="$ac_subdirs_all src/tcl"
 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 MEX MKOCTFILE PERL PYTHON pythondir PERL_INCLUDES PYTHON_VERSION PYTHON_INCLUDES PYTHON_SITE_PACKAGES VERSION RP_BASE subdirs LIBOBJS LTLIBOBJS'
 ac_subst_files=''
@@ -4256 +4257 @@
 
 # Provide some information about the compiler.
-echo "$as_me:4258:" \
+echo "$as_me:4259:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
@@ -4734 +4735 @@
 
 subdirs="$subdirs gui "
+
+
+
+subdirs="$subdirs src/tcl "
 
 

trunk/configure.in

@@ -196 +196 @@
 
 AC_CONFIG_SUBDIRS( gui )
+AC_CONFIG_SUBDIRS( src/tcl )
 
 dnl read Makefile.in and write Makefile

trunk/python/Rappture/queue.py

@@ -381 +381 @@
                     nodes,
                     executable,
+                    ppn=2,
                     execArgs='',
                     walltime='00:01:00',
@@ -402 +403 @@
         self.jobName(jobName)
         self.nodes(nodes)
+        self.ppn(ppn)
         self.walltime(walltime)
         self.executable(executable)
@@ -442 +444 @@
         self._mpirsl = ""
         if (self._flags & self.USE_MPI):
-            self._mpirsl = "(jobType=mpi)(count=%d)(hostcount=%d)" % \
-                            (self.nodes(), self.nodes())
+            # host_xcount is the number of machines
+            # xcount is the number of procs per machine
+            self._mpirsl = "(jobType=mpi)(xcount=%d)(host_xcount=%d)" % \
+                            (self.ppn(), self.nodes())
 
         (wall_hr,wall_min,wall_sec) = self.walltime().split(":")
@@ -449 +453 @@
 
         return """universe=grid
-    gridresource = gt2 tg-gatekeeper.purdue.teragrid.org:2120/jobmanager-pbs
+    gridresource = gt2 tg-gatekeeper.purdue.teragrid.org/jobmanager-pbs
     executable = %s
     output = %s
@@ -457 +461 @@
     initialDir = %s
     log = %s
-    #globusrsl = (project=TG-ECD060000N)(jobType=mpi)(count=2)(hostcount=2)(maxWallTime=WALLTIME)
+    #globusrsl = (project=TG-ECD060000N)(jobType=mpi)(xcount=2)(hostxcount=2)(maxWallTime=WALLTIME)
     globusrsl = (project=TG-ECD060000N)(maxWallTime=%g)%s(queue=%s)
     notification = never
@@ -616 +620 @@
     jobName = 'helloMPITest'
     resultsDir = createDir('4321')
-    executable = 'hello.sh'
+    executable = './hello.sh'
     shutil.copy('hello/hello.sh',resultsDir)
     shutil.copy('hello/hello',resultsDir)