Changeset 4627

Timestamp:

07/15/10 11:40:45 (15 years ago)

Author:

jschierm

Message:

Chaco: Updates for building as a new module.

Location:

issm/trunk/externalpackages/chaco

Files:

• chaco.patch (modified) (13 diffs)
• chaco_jes_notes.txt (modified) (1 diff)
• install.sh (modified) (1 diff)
• mex (added)
• mex/Chaco.c (added)
• mex/Chaco_m.m (added)
• mex/Chacox.c (added)
• mex/Makefile (added)
• mex/User_Params.debug (added)
• mex/User_Params.verbose (added)
• mex/mlchaco_README.txt (added)
• mex/mlchaco_jes_notes.txt (added)
• mex/user_params.c (added)

issm/trunk/externalpackages/chaco/chaco.patch

@@ -1 @@
-Only in /home/jschierm/Libs/Chaco-2.2: chaco_jes_notes.txt
-Only in /home/jschierm/Libs/Chaco-2.2: chaco_README.txt
-diff -rc src/code/assign/assign_out.c /home/jschierm/Libs/Chaco-2.2/code/assign/assign_out.c
+diff -rc src/code/assign/assign_out.c new/code/assign/assign_out.c
 *** src/code/assign/assign_out.c        1995-08-08 14:32:10.000000000 -0700
---- /home/jschierm/Libs/Chaco-2.2/code/assign/assign_out.c      2009-07-30 09:37:34.781348564 -0700
+--- new/code/assign/assign_out.c        2010-04-06 15:51:09.378194563 -0700
 ***************
 *** 3,8 ****
@@ -14 +12 @@
   static void assign_out_normal(), assign_out_inv();
   
-diff -rc src/code/eigen/get_extval.c /home/jschierm/Libs/Chaco-2.2/code/eigen/get_extval.c
+diff -rc src/code/eigen/get_extval.c new/code/eigen/get_extval.c
 *** src/code/eigen/get_extval.c 1995-08-08 14:32:20.000000000 -0700
---- /home/jschierm/Libs/Chaco-2.2/code/eigen/get_extval.c       2009-07-30 09:43:00.511686903 -0700
+--- new/code/eigen/get_extval.c 2010-04-06 15:51:09.399194588 -0700
 ***************
 *** 4,9 ****
@@ -27 +25 @@
   /* Finds first extended eigenpair of system corresponding to
      tridiagonal T using using Rafael's bisection technique. */
-diff -rc src/code/klvspiff/matching.c /home/jschierm/Libs/Chaco-2.2/code/klvspiff/matching.c
+diff -rc src/code/klvspiff/matching.c new/code/klvspiff/matching.c
 *** src/code/klvspiff/matching.c        1996-03-11 10:24:25.000000000 -0800
---- /home/jschierm/Libs/Chaco-2.2/code/klvspiff/matching.c      2009-07-30 09:43:11.604702814 -0700
+--- new/code/klvspiff/matching.c        2010-04-06 15:51:09.424194619 -0700
 ***************
 *** 6,11 ****
@@ -40 +38 @@
   #define  TRUE  1
   #define  FALSE 0
-diff -rc src/code/main/defs.h /home/jschierm/Libs/Chaco-2.2/code/main/defs.h
+diff -rc src/code/main/defs.h new/code/main/defs.h
 *** src/code/main/defs.h        1995-08-08 14:32:41.000000000 -0700
---- /home/jschierm/Libs/Chaco-2.2/code/main/defs.h      2009-08-25 10:02:57.088970763 -0700
+--- new/code/main/defs.h        2010-06-15 10:43:54.039227352 -0700
 ***************
 *** 9,11 ****
---- 9,27 ----
+--- 9,28 ----
   #define       PI      3.141592653589793
   #define       TWOPI   6.283185307179586
@@ -61 +59 @@
 +     #define realloc mxRealloc
 +     #define free mxFree
++       #define exit(status) mexErrMsgTxt("exit=" #status)
 + 
-+     #define check_graph chaco_check_graph
 + #endif
++ #define check_graph chaco_check_graph
 + 
-Only in /home/jschierm/Libs/Chaco-2.2/code/main: defs_old.h
-diff -rc src/code/Makefile /home/jschierm/Libs/Chaco-2.2/code/Makefile
+diff -rc src/code/Makefile new/code/Makefile
 *** src/code/Makefile   1997-10-02 10:23:22.000000000 -0700
---- /home/jschierm/Libs/Chaco-2.2/code/Makefile 2010-02-10 14:05:56.986149785 -0800
-***************
-*** 2,8 ****
+--- new/code/Makefile   2010-06-15 10:35:41.507925761 -0700
+***************
+*** 2,9 ****
   DEST=         ${DEST_DIR}/chaco
   CC =          gcc
@@ -78 +76 @@
   
   FILES.c=      main/user_params.c main/interface.c main/main.c \
---- 2,13 ----
+                submain/balance.c submain/divide.c submain/submain.c \
+--- 2,18 ----
   DEST=         ${DEST_DIR}/chaco
   CC =          gcc
@@ -89 +88 @@
 ! #CFLAGS =     -fPIC -fno-omit-frame-pointer -pthread -fexceptions -DMATLAB
   OFLAGS =      -O2
++ #AR =             /usr/ccs/bin/ar rcv   # for solaris 2
++ AR =             /usr/bin/ar rcv
++ #RANLIB =         /usr/ccs/bin/ranlib   # for solaris 2
++ RANLIB =         /usr/bin/ranlib
   
   FILES.c=      main/user_params.c main/interface.c main/main.c \
-Only in /home/jschierm/Libs/Chaco-2.2/code: Makefile_old
-diff -rc src/code/misc/timing.c /home/jschierm/Libs/Chaco-2.2/code/misc/timing.c
+                submain/balance.c submain/divide.c submain/submain.c \
+***************
+*** 90,97 ****
+  FILES.o=      $(FILES.c:.c=.o) 
+  
+  
+! ${DEST}:      ${FILES.o} Makefile
+!               ${CC} ${OFLAGS} ${FILES.o} -lm -o ${DEST}
+  
+  lint:
+                lint ${IFLAG} ${FILES.c} -lm
+--- 99,109 ----
+  FILES.o=      $(FILES.c:.c=.o) 
+  
+  
+! ${DEST}:      ${FILES.c} chaco.a Makefile
+!               ${CC} ${OFLAGS} chaco.a -lm -o ${DEST}
+! 
+! chaco.a:      ${FILES.o}
+!               ${AR} chaco.a ${FILES.o} ; ${RANLIB} chaco.a
+  
+  lint:
+                lint ${IFLAG} ${FILES.c} -lm
+***************
+*** 100,106 ****
+                alint ${IFLAG} ${FILES.c} -lm
+  
+  clean:
+!               rm -f */*.o ${DEST_DIR}/core
+  
+  .c.o:
+                ${CC} -c ${IFLAG} ${CFLAGS} -o $*.o $*.c
+--- 112,118 ----
+                alint ${IFLAG} ${FILES.c} -lm
+  
+  clean:
+!               rm -f */*.o ${DEST_DIR}/core
+  
+  .c.o:
+                ${CC} -c ${IFLAG} ${CFLAGS} -o $*.o $*.c
+diff -rc src/code/misc/timing.c new/code/misc/timing.c
 *** src/code/misc/timing.c      1997-01-03 09:10:52.000000000 -0800
---- /home/jschierm/Libs/Chaco-2.2/code/misc/timing.c    2009-07-30 09:43:19.954714766 -0700
+--- new/code/misc/timing.c      2010-04-06 15:51:09.480194687 -0700
 ***************
 *** 3,8 ****
@@ -105 +147 @@
   /* Timing parameters. */
   
-diff -rc src/code/util/bail.c /home/jschierm/Libs/Chaco-2.2/code/util/bail.c
+diff -rc src/code/util/bail.c new/code/util/bail.c
 *** src/code/util/bail.c        1995-08-08 14:33:01.000000000 -0700
---- /home/jschierm/Libs/Chaco-2.2/code/util/bail.c      2009-07-30 09:43:24.495721262 -0700
+--- new/code/util/bail.c        2010-05-27 10:29:34.698534832 -0700
 ***************
 *** 4,9 ****
@@ -118 +160 @@
   /* Wrapper for exit() - print message and exit with status code. Exit code
      of 0 indicates normal termination. Exit code of 1 indicates early 
-diff -rc src/code/util/checkpnt.c /home/jschierm/Libs/Chaco-2.2/code/util/checkpnt.c
+***************
+*** 14,20 ****
+  int       status;
+  {
+      extern FILE *Output_File;         /* Output file or NULL */
+-     void      exit();
+  
+      if (msg != NULL && (int) strlen(msg) > 0) {
+          printf("%s\n", msg);
+--- 15,20 ----
+Only in new/code/util: bail_old.c
+diff -rc src/code/util/checkpnt.c new/code/util/checkpnt.c
 *** src/code/util/checkpnt.c    1995-08-08 14:33:01.000000000 -0700
---- /home/jschierm/Libs/Chaco-2.2/code/util/checkpnt.c  2009-07-30 09:43:28.190726549 -0700
+--- new/code/util/checkpnt.c    2010-04-06 15:51:09.513194728 -0700
 ***************
 *** 4,9 ****
@@ -131 +184 @@
   /* Debug break point. */
   void      checkpnt(tag)
-diff -rc src/code/util/doubleout.c /home/jschierm/Libs/Chaco-2.2/code/util/doubleout.c
+diff -rc src/code/util/doubleout.c new/code/util/doubleout.c
 *** src/code/util/doubleout.c   1995-08-08 14:33:02.000000000 -0700
---- /home/jschierm/Libs/Chaco-2.2/code/util/doubleout.c 2009-07-30 09:43:34.192735135 -0700
+--- new/code/util/doubleout.c   2010-04-06 15:51:09.527194745 -0700
 ***************
 *** 3,8 ****
@@ -144 +197 @@
   /* Print a double precision number with filtering format to screen. */
   void      doubleout(number, mode)
-diff -rc src/code/util/smalloc.c /home/jschierm/Libs/Chaco-2.2/code/util/smalloc.c
+diff -rc src/code/util/smalloc.c new/code/util/smalloc.c
 *** src/code/util/smalloc.c     1996-03-11 10:44:07.000000000 -0800
---- /home/jschierm/Libs/Chaco-2.2/code/util/smalloc.c   2009-07-30 09:43:39.722743047 -0700
+--- new/code/util/smalloc.c     2010-04-06 15:51:09.542194763 -0700
 ***************
 *** 4,9 ****
@@ -157 +210 @@
   static int nmalloc = 0;               /* number of calls to malloc */
   static int nfree = 0;         /* number of calls to free */
-diff -rc src/code/util/strout.c /home/jschierm/Libs/Chaco-2.2/code/util/strout.c
+diff -rc src/code/util/strout.c new/code/util/strout.c
 *** src/code/util/strout.c      1995-08-08 14:33:05.000000000 -0700
---- /home/jschierm/Libs/Chaco-2.2/code/util/strout.c    2009-07-30 09:43:47.607754325 -0700
+--- new/code/util/strout.c      2010-04-06 15:51:09.549194772 -0700
 ***************
 *** 4,9 ****
@@ -170 +223 @@
   /* Wrapper for a printf statement with a string as only arg.
      Prints to screen and to output file if there is one. */
+Only in new/exec: chaco

issm/trunk/externalpackages/chaco/chaco_jes_notes.txt

@@ -80 +80 @@
 > 
 
+6/15/10:
+
+- moved check_graph rename outside of MATLAB compiler directive.
+- created library chaco.a (without MATLAB compiler directive) for Chaco x-layer to link and implemented it in chaco stand-alone link.
+

issm/trunk/externalpackages/chaco/install.sh

@@ -23 +23 @@
 cd src/code
 make
-# Clean up, so that meshpart creates its own objects for mlchaco
+# Clean up objects (but not library or executable)
 make clean
 cd ../..