Master index types

.github/workflows/main.yml

@@ -21,7 +21,7 @@ jobs:
         sudo apt install xsltproc -y
     - name: Install sac2c
       run: |
-        git clone --recursive --single-branch https://gitlab.sac-home.org/sac-group/sac2c.git
+        git clone --single-branch --recursive https://gitlab.sac-home.org/sac-group/sac2c.git
         cd sac2c
         make release -j2
         cp build_p/sac2c_p /usr/local/bin/sac2c
@@ -52,57 +52,8 @@ jobs:
         make all
         ./test.sh
 
-  build-macos-x86:
-    runs-on: macos-13
-    steps:
-    - name: Get HEAD and submodules
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-        submodules: 'recursive'
-    - name: Install dependencies
-      run: |
-        brew update
-        brew install libxslt
-    - name: Set XCode version
-      uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: '14.2'
-    - name: Install sac2c
-      run: |
-        git clone --recursive --single-branch https://gitlab.sac-home.org/sac-group/sac2c.git
-        cd sac2c
-        make release -j2
-        cp build_p/sac2c_p /usr/local/bin/sac2c
-        sac2c -V
-    - name: Create build dir
-      run: |
-        cmake -E make_directory ${{runner.workspace}}/build
-    - name: Configure build-system
-      shell: bash
-      working-directory: ${{runner.workspace}}/build
-      run: cmake ${GITHUB_WORKSPACE}
-    - name: Build
-      shell: bash
-      working-directory: ${{runner.workspace}}/build
-      run: |
-        cmake --build . -j4 >&1 | tee build.log
-        if [ ${PIPESTATUS[0]} -ne 0 ]; then
-          echo "!!! ERROR detected in build !!!";
-          exit 1;
-        fi
-        ${GITHUB_WORKSPACE}/ci/fail-on-warning.sh build.log
-    - name: Test
-      shell: bash
-      working-directory: ${{runner.workspace}}/build
-      run: |
-        git clone --single-branch https://github.com/SacBase/IntegrationTests.git
-        cd IntegrationTests
-        make all
-        ./test.sh
-
   build-macos-arm:
-    runs-on: macos-15
+    runs-on: macos-latest
     steps:
     - name: Get HEAD and submodules
       uses: actions/checkout@v2
@@ -116,10 +67,10 @@ jobs:
     - name: Set XCode version
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '16.2'
+        xcode-version: latest-stable
     - name: Install sac2c
       run: |
-        git clone --recursive --single-branch https://gitlab.sac-home.org/sac-group/sac2c.git
+        git clone --single-branch --recursive https://gitlab.sac-home.org/sac-group/sac2c.git
         cd sac2c
         make release -j2
         cp build_p/sac2c_p /usr/local/bin/sac2c

src/CMakeLists.txt

@@ -309,6 +309,8 @@ SET (C_DEPS_SRC
     numerical/src/Math/int_log.c
     numerical/src/Math/sign.c
     numerical/src/Math/isnan.c
+    numerical/src/Math/frexp.c
+    numerical/src/Math/ldexp.c
     numerical/src/Math/isinf.c
     numerical/src/Math/isfinite.c
     random/src/Xoshiro.c

src/auxiliary/src/C99Benchmarking/bench.c

@@ -16,9 +16,9 @@
 static const char * unitName[] = {"s", "ms", "us", "ns"};
 
 struct bench {                                                   
-  int                num;
+  sac_int            num;
   char *             name;
-  int                timeUnit;
+  sac_int            timeUnit;
   double             startTime;
   double             stopTime;
 };
@@ -51,7 +51,7 @@ char* benchName( struct bench* interval)
   return( newName);
 }
 
-int benchNum( struct bench* interval)
+sac_int benchNum( struct bench* interval)
 {
   return( interval->num);
 }
@@ -64,7 +64,7 @@ char* benchUnitName( struct bench* interval)
   return( unit_name);
 }
 
-int benchUnit( struct bench* interval)
+sac_int benchUnit( struct bench* interval)
 {
   return( interval->timeUnit);
 }
@@ -74,7 +74,7 @@ void benchCreate( struct bench** interval)
   /* benchGetInterval actually creates the data structure */
 }     
 
-struct bench* benchGetInterval_si(char * name, int num)
+struct bench* benchGetInterval_si(char * name, sac_int num)
 {                                                                        
   struct bench *interval;
   char* newName;
@@ -87,7 +87,7 @@ struct bench* benchGetInterval_si(char * name, int num)
   return( interval);
 }                                                                        
 
-struct bench* benchGetInterval_i( int num)               
+struct bench* benchGetInterval_i( sac_int num)               
 {                                                                        
   struct bench *interval;
   interval = benchGetInterval_si("\0", num);
@@ -101,7 +101,7 @@ struct bench* benchGetInterval_s( char *name)
   return( interval);
 }                                                                        
 
-struct bench* benchGetInterval_siu(char * name, int num, int timeunit)
+struct bench* benchGetInterval_siu(char * name, sac_int num, sac_int timeunit)
 {                                                                        
   struct bench *interval;
   char* newName;
@@ -114,14 +114,14 @@ struct bench* benchGetInterval_siu(char * name, int num, int timeunit)
   return( interval);
 }                                                                        
 
-struct bench* benchGetInterval_iu( int num, int timeunit)               
+struct bench* benchGetInterval_iu( sac_int num, sac_int timeunit)               
 {                                                                        
   struct bench *interval;
   interval = benchGetInterval_siu("\0", num, timeunit);
   return( interval);
 }                                                                        
 
-struct bench* benchGetInterval_su( char *name, int timeunit) 
+struct bench* benchGetInterval_su( char *name, sac_int timeunit) 
 {                                                                        
   struct bench *interval;
   interval = benchGetInterval_siu(name, -1, timeunit);

src/auxiliary/src/CudaBenchmarking/bench.cu

@@ -17,9 +17,9 @@ extern "C" {
 static const char * unitName[] = {"s", "ms", "us", "ns"};
 
 struct cudabench {                                                   
-  int                num;
+  sac_int                num;
   char *             name;
-  int                timeUnit;
+  sac_int                timeUnit;
   cudaEvent_t        start;
   cudaEvent_t        stop;
 };
@@ -57,7 +57,7 @@ char* benchName( struct cudabench* interval)
   return( newName);
 }
 
-int benchNum( struct cudabench* interval)
+sac_int benchNum( struct cudabench* interval)
 {
   return( interval->num);
 }
@@ -70,7 +70,7 @@ char* benchUnitName( struct cudabench* interval)
   return( unit_name);
 }
 
-int benchUnit( struct cudabench* interval)
+sac_int benchUnit( struct cudabench* interval)
 {
   return( interval->timeUnit);
 }
@@ -80,7 +80,7 @@ void benchCreate( struct cudabench** interval)
   /* benchGetInterval actually creates the data structure */
 }     
 
-struct cudabench* benchGetInterval_si(char * name, int num)
+struct cudabench* benchGetInterval_si(char * name, sac_int num)
 {                                                                        
   struct cudabench *interval;
   char* newName;
@@ -93,7 +93,7 @@ struct cudabench* benchGetInterval_si(char * name, int num)
   return( interval);
 }                                                                        
 
-struct cudabench* benchGetInterval_i( int num)               
+struct cudabench* benchGetInterval_i( sac_int num)               
 {                                                                        
   struct cudabench *interval;
   interval = benchGetInterval_si("\0", num);
@@ -107,7 +107,7 @@ struct cudabench* benchGetInterval_s( char *name)
   return( interval);
 }                                                                        
 
-struct cudabench* benchGetInterval_siu(char * name, int num, int timeunit)
+struct cudabench* benchGetInterval_siu(char * name, sac_int num, sac_int timeunit)
 {                                                                        
   struct cudabench *interval;
   char* newName;
@@ -120,14 +120,14 @@ struct cudabench* benchGetInterval_siu(char * name, int num, int timeunit)
   return( interval);
 }                                                                        
 
-struct cudabench* benchGetInterval_iu( int num, int timeunit)               
+struct cudabench* benchGetInterval_iu( sac_int num, sac_int timeunit)               
 {                                                                        
   struct cudabench *interval;
   interval = benchGetInterval_siu("\0", num, timeunit);
   return( interval);
 }                                                                        
 
-struct cudabench* benchGetInterval_su( char *name, int timeunit) 
+struct cudabench* benchGetInterval_su( char *name, sac_int timeunit) 
 {                                                                        
   struct cudabench *interval;
   interval = benchGetInterval_siu(name, -1, timeunit);

src/numerical/Math.sac

@@ -160,20 +160,26 @@ external float exp(float X);
 
 external double, int frexp(double X);
     #pragma linksign [0,2,1]
+    #pragma linkname "SAC_MATH_frexp"
+    #pragma linkobj "src/Math/frexp.o"
     #pragma header "<math.h>"
 
 external float, int frexp(float X);
     #pragma linksign [0,2,1]
-    #pragma linkname "frexpf"
+    #pragma linkname "SAC_MATH_frexpf"
+    #pragma linkobj "src/Math/frexp.o"
     #pragma header "<math.h>"
 
 external double ldexp(double X, int EXP);
     #pragma linksign [0,1,2]
+    #pragma linkname "SAC_MATH_ldexp"
+    #pragma linkobj "src/Math/ldexp.o"
     #pragma header "<math.h>"
 
 external float ldexp(float X, int EXP);
     #pragma linksign [0,1,2]
-    #pragma linkname "ldexpf"
+    #pragma linkname "SAC_MATH_ldexpf"
+    #pragma linkobj "src/Math/ldexp.o"
     #pragma header "<math.h>"
 
 external double log(double X);

src/numerical/src/Math/frexp.c

@@ -0,0 +1,29 @@
+/**
+ * Dealing with sac_int arguments.
+ */
+#include <math.h>
+#include "sacinterface.h"
+
+double SAC_MATH_frexp( double val, sac_int *exp)
+{
+  int  ex;
+  double res;
+
+  res = frexp (val, &ex);
+
+  *exp = (sac_int)ex;
+
+  return res;
+}
+
+float SAC_MATH_frexpf( float val, sac_int *exp)
+{
+  int  ex;
+  float res;
+
+  res = frexpf (val, &ex);
+
+  *exp = (sac_int)ex;
+
+  return res;
+}

src/numerical/src/Math/ldexp.c

@@ -0,0 +1,15 @@
+/**
+ * Dealing with sac_int arguments.
+ */
+#include <math.h>
+#include "sacinterface.h"
+
+double SAC_MATH_ldexp( double val, sac_int exp)
+{
+  return ldexp (val, (int)exp);
+}
+
+float SAC_MATH_ldexpf( float val, sac_int exp)
+{
+  return ldexpf (val, (int)exp);
+}

src/stdio/src/ComplexIO/PrintComplexArray.c

@@ -7,19 +7,19 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "sac.h"
+#include "sacinterface.h"
 
 #define COMPLEX     1
 
 typedef char* string;
 typedef double complex[2];
 
 static
-int Index2Offset( int dim, int *shp, int *index)
+sac_int Index2Offset( sac_int dim, sac_int *shp, sac_int *index)
 {
-  int i,n;
-  int offset=0;
-  int fact;
+  sac_int i,n;
+  sac_int offset=0;
+  sac_int fact;
 
   for (i=0; i<dim; i++) {
     fact=1;
@@ -31,17 +31,17 @@ int Index2Offset( int dim, int *shp, int *index)
   return(offset);
 }
 
-static void PrintArr(FILE *stream, int typeflag, string format, int dim, int * shp, void *a)
+static void PrintArr(FILE *stream, int typeflag, string format, sac_int dim, sac_int * shp, void *a)
 {
-  int i,n, element_count;
+  sac_int i,n, element_count;
   char *space=" ";
-  int *index;
+  sac_int *index;
 
-  fprintf(stream, "Dimension: %2i\n", dim);
+  fprintf(stream, "Dimension: %" PRIisac "\n", dim);
   fprintf(stream, "Shape    : <");
   element_count = 1;
   for (i=0;i<dim;) {
-    fprintf(stream, " %2i", shp[i]);
+    fprintf(stream, " %" PRIisac, shp[i]);
     element_count = element_count * shp[i];
     i++;
     if (i<dim) {
@@ -70,7 +70,7 @@ static void PrintArr(FILE *stream, int typeflag, string format, int dim, int * s
       fprintf(stream, "<>\n");
     } else {
 
-      index = SAC_MALLOC(dim * sizeof(int));
+      index = (sac_int *)malloc(dim * sizeof(sac_int));
       for (i=0; i<dim; i++) {
         index[i]=0;
       }
@@ -130,20 +130,20 @@ static void PrintArr(FILE *stream, int typeflag, string format, int dim, int * s
 
       fprintf(stream, "\n");
 
-      SAC_FREE(index);
+      free(index);
     } /* if (element_count == 0) */
   } else {
     SAC_RuntimeError ("Dimension is less than 0, aborting!");
   }
 
 }
 
-void COMPLEXIO__PrintComplexArray( FILE *stream, int dim, int * shp, complex * a)
+void COMPLEXIO__PrintComplexArray( FILE *stream, sac_int dim, sac_int * shp, complex * a)
 {
   PrintArr(stream, COMPLEX, "(%.g, %.g) ", dim, shp, a);
 }
 
-void COMPLEXIO__PrintComplexArrayFormat( FILE *stream, string format, int dim, int * shp, complex * a)
+void COMPLEXIO__PrintComplexArrayFormat( FILE *stream, string format, sac_int dim, sac_int * shp, complex * a)
 {
   PrintArr(stream, COMPLEX, format, dim, shp, a);
 }