ip

Author: bilam

jsrc/cblas.c

@@ -30,14 +30,11 @@ char hasopenmp=0;
 #define LIBCBLASNAME "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib"
 #endif
 #elif defined(_WIN32)
-#if defined(_WIN64)
-#if defined(__aarch64__)||defined(_M_ARM64)
-#define LIBCBLASNAME "libopenblas_arm64.dll"
-#else
 #define LIBCBLASNAME "libopenblas.dll"
-#endif
-#else
-#define LIBCBLASNAME "libopenblas_32.dll"
+#if defined(__aarch64__)||defined(_M_ARM64)
+#define LIBCBLASNAME2 "libopenblas_arm64.dll"
+#elif !defined(_WIN64)
+#define LIBCBLASNAME2 "libopenblas_32.dll"
 #endif
 #elif defined(ANDROID) || defined(__OpenBSD__)
 #define LIBCBLASNAME "liblapack.so"
@@ -78,23 +75,32 @@ void cblasinit(C*libpath) {
 #elif defined(__wasm__)
  libcblas= 0;
 #elif defined(_WIN32)
- fprintf(stderr, "a1\n");
+#if defined(__aarch64__)||defined(_M_ARM64)||!defined(_WIN64)
  if(libpath&&*libpath){
- fprintf(stderr, "a2 %s\n",libpath);
-  strcpy(cblasfile,libpath);strcat(cblasfile,"\\");strcat(cblasfile,LIBCBLASNAME);
-  fprintf(stderr, "a3 %s\n",cblasfile);
+  strcpy(cblasfile,libpath);strcat(cblasfile,"\\");strcat(cblasfile,LIBCBLASNAME2);
   if(!(libcblas= LoadLibraryA(cblasfile))){  /* first try current directory */
-   strcpy(cblasfile,libpath);strcat(cblasfile,"\\..\\addons\\math\\lapack2\\lib\\");strcat(cblasfile,LIBCBLASNAME);
-  fprintf(stderr, "a4 %s\n",cblasfile);
+   strcpy(cblasfile,libpath);strcat(cblasfile,"\\..\\addons\\math\\lapack2\\lib\\");strcat(cblasfile,LIBCBLASNAME2);
    if(!(libcblas= LoadLibraryA(cblasfile)))  /* lapack2 addon lib folder */
- fprintf(stderr, "a5\n");
-    libcblas= LoadLibraryA(strcpy(cblasfile,LIBCBLASNAME));
+    libcblas= LoadLibraryA(strcpy(cblasfile,LIBCBLASNAME2));
   }
- } else libcblas= LoadLibraryA(strcpy(cblasfile,LIBCBLASNAME));
+ } else libcblas= LoadLibraryA(strcpy(cblasfile,LIBCBLASNAME2));
  if(libcblas && !GetProcAddress(libcblas,"cblas_dgemm")){   /* check cblas routine */
- fprintf(stderr, "a6\n");
   FreeLibrary(libcblas); libcblas= 0;
  }
+#endif
+ if(!libcblas){
+  if(libpath&&*libpath){
+   strcpy(cblasfile,libpath);strcat(cblasfile,"\\");strcat(cblasfile,LIBCBLASNAME);
+   if(!(libcblas= LoadLibraryA(cblasfile))){  /* first try current directory */
+    strcpy(cblasfile,libpath);strcat(cblasfile,"\\..\\addons\\math\\lapack2\\lib\\");strcat(cblasfile,LIBCBLASNAME);
+    if(!(libcblas= LoadLibraryA(cblasfile)))  /* lapack2 addon lib folder */
+     libcblas= LoadLibraryA(strcpy(cblasfile,LIBCBLASNAME));
+   }
+  } else libcblas= LoadLibraryA(strcpy(cblasfile,LIBCBLASNAME));
+  if(libcblas && !GetProcAddress(libcblas,"cblas_dgemm")){   /* check cblas routine */
+   FreeLibrary(libcblas); libcblas= 0;
+  }
+ }
 #else
  if(libpath&&*libpath){
   int i=0;

script/buildga.cmd

@@ -33,7 +33,7 @@ copy pthreads4w\bin\pthreadVC3.dll %B%
 copy mpir\windows\x64\mpir.dll %B%
 copy openmp\obj\windows\libomp.dll %B%
 copy pcre2\windows\x64\jpcre2.dll %A%\tools\regex\.
-curl --output-dir "%B%" -O "https://www.jsoftware.com/download/lapackbin/libopenblas.dll"
+curl --output-dir "%B%" -O "https://www.jsoftware.com/download/lapackbin/x64/libopenblas.dll"
 GOTO L01C
 :L01A
 mkdir j32
@@ -44,7 +44,7 @@ copy pthreads4w\bin\pthreadVC3-w32.dll %C%\pthreadVC3.dll
 copy mpir\windows\x86\mpir.dll %C%\mpir32.dll
 copy openmp\obj\windows\libomp32.dll %C%\libomp32.dll
 copy pcre2\windows\x86\jpcre2.dll %A%\tools\regex\jpcre2_32.dll
-curl --output-dir "%C%" -O "https://www.jsoftware.com/download/lapackbin/libopenblas_32.dll"
+curl --output-dir "%C%" -O "https://www.jsoftware.com/download/lapackbin/x86/libopenblas.dll"
 GOTO L01C
 :L01B
 mkdir j64
@@ -53,7 +53,7 @@ copy pthreads4w\bin\pthreadVC3-arm64.dll %B%\pthreadVC3.dll
 copy mpir\windows\arm64\mpir.dll %B%
 copy openmp\obj\windows\libomp.dll %B%
 copy pcre2\windows\arm64\jpcre2.dll %A%\tools\regex\jpcre2_arm64.dll
-curl --output-dir "%B%" -O "https://www.jsoftware.com/download/lapackbin/libopenblas_arm64.dll"
+curl --output-dir "%B%" -O "https://www.jsoftware.com/download/lapackbin/arm64/libopenblas.dll"
 :L01C
 
 copy version.txt jsrc\jversion.h