minor

Author: bilam

jlibrary/addons/math/lapack/lapack.ijs

@@ -8,7 +8,8 @@ NB. lapack definitions
 path=: jpath '~addons/math/lapack/'
 
 3 : 0''
-if. UNAME-:'Linux' do.
+if. 0: ~: 4!:0 @ <'IFWA64' do. IFWA64=. 0 end.
+if. (<UNAME)e.'Linux';'FreeBSD';'OpenBSD' do.
   dll=: 'liblapack.so.3'
   JLAPACK=: 'F'
 elseif. UNAME-:'Darwin' do.
@@ -23,31 +24,25 @@ elseif. UNAME-:'Darwin' do.
   end.
 elseif. UNAME-:'Win' do.
   if. IF64 do.
-    if. fexist path,'jlapack64.dll' do.
-      dll=: '"',path,'jlapack64.dll"'
-      JLAPACK=: 'J'
-    else.
-      dll=: 'liblapack.dll'
+    if. IFWA64 do.
+      dll=: 'libopenblas',((-.IFWA64){::'_arm64';(-.IF64)#'_32'),'.dll'
       JLAPACK=: 'F'
+    else.
+      if. fexist path,'jlapack64.dll' do.
+        dll=: '"',path,'jlapack64.dll"'
+        JLAPACK=: 'J'
+      else.
+        dll=: 'libopenblas',((-.IFWA64){::'_arm64';(-.IF64)#'_32'),'.dll'
+        JLAPACK=: 'F'
+      end.
     end.
   else.
     dll=: '"',path,'jlapack.dll"'
     JLAPACK=: 'J'
   end.
-elseif. UNAME-:'Android' do.
-  JLAPACK=: 'J'
-  arch=. LF-.~ 2!:0'getprop ro.product.cpu.abi'
-  if. IF64 < arch-:'arm64-v8a' do.
-    arch=. 'armeabi-v7a'
-  elseif. IF64 < arch-:'x86_64' do.
-    arch=. 'x86'
-  end.
-  dll=: '"',(jpath'~bin/../libexec/android-libs/',arch,'/liblapack.so'),'"'
-  if. 0=fexist dltb dll -. '"' do.
-    smoutput 'lapack error: please run install_jlapack_'''' to install liblapack.so'
-  end.
 elseif. do.
-  'platform not supported' 13!:8[10
+  dll=: 'liblapack.so'
+  JLAPACK=: 'F'
 end.
 ''
 )

script/testga.ijs

@@ -28,8 +28,7 @@ echo '_DEBUG: ',": 2!:5'_DEBUG'
 echo 'RUNNER_ARCH: ',": 2!:5'RUNNER_ARCH'
 
 ddall=: ddall -. blacklist=: blacklist, ('OpenBSD'-:UNAME)#(<testpath),each <'gstack.ijs' NB. temporarily disable
-ddall=: ddall -. blacklist=: blacklist, ('OpenBSD'-:UNAME)#(<testpath),each 'gtdot.ijs';'gtdot3.ijs';'gtdot4.ijs';'gtdot5.ijs' NB. temporarily disable
-ddall=: ~. ddall ,~ (-.IFWA64)#((<UNAME)e.'Win';'Darwin')#(<testpath),each 'glapack.ijs';'glapackcb.ijs'
+ddall=: ~. ddall -. blacklist=: blacklist, ('OpenBSD'-:UNAME)#(<testpath),each 'gtdot.ijs';'gtdot3.ijs';'gtdot4.ijs';'gtdot5.ijs' NB. temporarily disable
 
 NB. smoke test
 

test/tsu.ijs

@@ -50,7 +50,7 @@ blacklist=: ((<testpath),each 'gmbx.ijs';'gfft.ijs';'glapack.ijs';'glapackcb.ijs
 blacklist=: blacklist, (IFIOS+.(UNAME-:'Wasm'))#(<testpath),each <'gregex.ijs' NB. require libjpcre2 binary
 blacklist=: blacklist, (0=(9!:56'c_avx2')+.9!:56'emu_avx2')#(<testpath),each 'g6x14.ijs';'g128x14.ijs';'g128x19.ijs' NB. avx2 or emu_avx2
 blacklist=: blacklist, (0=9!:56'PYXES')#(<testpath),each 'gtdot.ijs';'gtdot1.ijs';'gtdot2.ijs';'gtdot3.ijs';'gtdot4.ijs';'gtdot5.ijs';'g128x14.ijs';'g128x19.ijs' NB. require multithreading
-blacklist=: blacklist, (0=15!:23'')#(<testpath),each 'g15x.ijs';'g7x5.ijs';'gdll.ijs';'gdll_df.ijs';'gmmf.ijs';'gmmf1s.ijs';'gmmf1u.ijs';'gmmf1w.ijs'  NB. 15!:0 unavailable
+blacklist=: blacklist, (0=15!:23'')#(<testpath),each 'g15x.ijs';'g7x5.ijs';'gdll.ijs';'gdll_df.ijs';'gmmf.ijs';'gmmf1s.ijs';'gmmf1u.ijs';'gmmf1w.ijs';'gfft.ijs';'glapack.ijs';'glapackcb.ijs';'gregex.ijs'  NB. 15!:0 unavailable
 blacklist=: blacklist, ('Wasm'-:UNAME)#(<testpath),each <'gstack.ijs'  NB. crash
 blacklist=: blacklist, (IFQT*.'Wasm'-:UNAME)#(<testpath),each 'g331ps.ijs';'gsp422.ijs';'gsp432.ijs'  NB. crash
 blacklist=: blacklist, IFIOS#(<testpath),each <'gipht.ijs'  NB. crash if included in the whole suite, but ok if running alone