Ticket #57669: patch-taucs-build.2.diff

config/darwin.mk

@@ -8 +8 @@
 PATHSEP=/
 DEFFLG=-D
 
-#CC        = gcc
-CFLAGS    = -O3 -faltivec
+CC        = @@CC@@
+CFLAGS    = @@CFLAGS@@ -DBLAS_LIBRARIES=vecLibFort -DLAPACK_LIBRARIES=vecLibFort
 COUTFLG   = -o ./
 
-FC        = $(CC)
-FFLAGS    = $(CFLAGS)
+FC        = @@FC@@
+FFLAGS    = @@FFLAGS@@
 FOUTFLG   = $(COUTFLG)
 
-LD        = $(CC) 
-LDFLAGS   = $(CFLAGS)
+LD        = $(FC)
+LDFLAGS   = @@LDFLAGS@@
 LOUTFLG   = $(COUTFLG)
 
 AR        = ar -cr
@@ -26 +26 @@
 RANLIB    = ranlib
 RM        = rm -rf
 
-LIBBLAS   = -framework vecLib
+LIBBLAS   = -lvecLibFort
 LIBLAPACK = 
-LIBMETIS  = -Lexternal/lib/darwin -lmetis
+LIBMETIS  = -lmetis
 
-LIBF77 = -Lexternal/lib/darwin -lf2c
+LIBF77 = -lf2c
 # crypto is for ftime, which is used by the timing routines
 # the documentation says its in libcompat, but on my system
 # there is no libcompat, but libcrypto provides it
-LIBC   = -lm -lcrypto
+LIBC   =
 
 #########################################################
 

progs/taucs_blas_underscore_test.c

@@ -26 +26 @@
   dgemm_("N","N", &n,&n,&n, &alpha, &A,&ld, &B,&ld, &beta, &C,&ld);
 
   printf("\n\n");
-  printf("Linking with dgemm_ succedded\n");
+  printf("Linking with dgemm_ succeeded\n");
   printf("\n\n");
 
   if (C == 97.0) {

progs/test_linsolve.c

@@ -81 +81 @@
   rc = taucs_linsolve(A,NULL,1, y,b,colamd,opt_arg);
   if (rc == TAUCS_SUCCESS) return TAUCS_ERROR; 
 
-  printf("TESING SYMMETRIC ORDERINGS SUCCEDDED\n");
+  printf("TESING SYMMETRIC ORDERINGS SUCCEEDED\n");
 
   return TAUCS_SUCCESS;
 }
@@ -116 +116 @@
   rc = taucs_linsolve(A,NULL,1, y,b,llmd,opt_arg);
   if (rc == TAUCS_SUCCESS) return TAUCS_ERROR; 
 
-  printf("TESING SPD FACTORIZATIONS SUCCEDDED\n");
+  printf("TESING SPD FACTORIZATIONS SUCCEEDED\n");
 
   return TAUCS_SUCCESS;
 }
@@ -176 +176 @@
   rc = taucs_linsolve(NULL,&F,0, NULL,NULL,factor,opt_arg);
   if (rc != TAUCS_SUCCESS) return rc;
 
-  printf("TESING SPD FACTORSOLVE SUCCEDDED\n");
+  printf("TESING SPD FACTORSOLVE SUCCEEDED\n");
 
   return TAUCS_SUCCESS;
 }

src/taucs_timer.c

@@ -245 +245 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/types.h>                                                 
-#include <sys/timeb.h>                                                 
 
 double taucs_wtime()
 {
-  struct timeb T;
+  struct timeval T;
   /*static int first_time    = 1;*/
   /*  static time_t start_time, time_diff;
-      static time_t start_mill, mill_diff;
+      static time_t start_micro, micro_diff;
   */
 
   static time_t time_diff;
-  static time_t mill_diff;
+  static time_t micro_diff;
   /*int    rc;*/
   double dt;
   
-  (void) ftime( &T );
+  (void) gettimeofday( &T,NULL );
   /*
   if (first_time) {
     first_time = 0;
-    start_time = T.time;
-    start_mill = T.millitm;
+    start_time = T.tv_sec;
+    start_micro = T.tv_usec;
   }
 
-  time_diff = T.time - start_time;
-  mill_diff = T.millitm - start_mill; 
+  time_diff = T.tv_sec - start_time;
+  micro_diff = T.tv_usec - start_micro; 
   */
-  time_diff = T.time;
-  mill_diff = T.millitm;
+  time_diff = T.tv_sec;
+  micro_diff = T.tv_usec;
 
-  dt = ((double) time_diff) + (1e-3) * ((double) mill_diff);
+  dt = ((double) time_diff) + (1e-6) * ((double) micro_diff);
 
   return dt;
 }