Skip to content

Commit 319d751

Browse files
committed
emuavx.yml
1 parent 2706ae3 commit 319d751

3 files changed

Lines changed: 4 additions & 16 deletions

File tree

.github/workflows/emuavx.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ jobs:
337337
NASM: ${{github.workspace}}\openssl-asm\nasm
338338
USE_PYXES: 0
339339
USE_EMU_AVX: 1
340-
_DEBUG: 0
341340
run: |
342341
script\buildga.cmd x64
343342
@@ -346,7 +345,6 @@ jobs:
346345
env:
347346
USE_PYXES: 0
348347
USE_EMU_AVX: 1
349-
_DEBUG: 0
350348
run: |
351349
script\testga.cmd x64
352350
@@ -370,7 +368,6 @@ jobs:
370368
NASM: ${{github.workspace}}\openssl-asm\nasm
371369
USE_PYXES: 1
372370
USE_EMU_AVX: 0
373-
_DEBUG: 0
374371
run: |
375372
script\buildga.cmd x64
376373
@@ -379,7 +376,6 @@ jobs:
379376
env:
380377
USE_PYXES: 1
381378
USE_EMU_AVX: 0
382-
_DEBUG: 0
383379
run: |
384380
script\testga.cmd x64
385381
@@ -403,7 +399,6 @@ jobs:
403399
NASM: ${{github.workspace}}\openssl-asm\nasm
404400
USE_PYXES: 0
405401
USE_EMU_AVX: 0
406-
_DEBUG: 0
407402
run: |
408403
script\buildga.cmd x64
409404
@@ -412,7 +407,6 @@ jobs:
412407
env:
413408
USE_PYXES: 0
414409
USE_EMU_AVX: 0
415-
_DEBUG: 0
416410
run: |
417411
script\testga.cmd x64
418412
@@ -435,7 +429,6 @@ jobs:
435429
env:
436430
USE_PYXES: 0
437431
USE_EMU_AVX: 1
438-
_DEBUG: 0
439432
run: |
440433
script\buildga.cmd arm64
441434
@@ -444,7 +437,6 @@ jobs:
444437
env:
445438
USE_PYXES: 0
446439
USE_EMU_AVX: 1
447-
_DEBUG: 0
448440
run: |
449441
script\testga.cmd arm64
450442
@@ -467,7 +459,6 @@ jobs:
467459
env:
468460
USE_PYXES: 1
469461
USE_EMU_AVX: 0
470-
_DEBUG: 0
471462
run: |
472463
script\buildga.cmd arm64
473464
@@ -476,7 +467,6 @@ jobs:
476467
env:
477468
USE_PYXES: 1
478469
USE_EMU_AVX: 0
479-
_DEBUG: 0
480470
run: |
481471
script\testga.cmd arm64
482472
@@ -499,7 +489,6 @@ jobs:
499489
env:
500490
USE_PYXES: 0
501491
USE_EMU_AVX: 0
502-
_DEBUG: 0
503492
run: |
504493
script\buildga.cmd arm64
505494
@@ -508,7 +497,6 @@ jobs:
508497
env:
509498
USE_PYXES: 0
510499
USE_EMU_AVX: 0
511-
_DEBUG: 0
512500
run: |
513501
script\testga.cmd arm64
514502
@@ -536,7 +524,6 @@ jobs:
536524
USE_OPENMP: 0
537525
USE_PYXES: 1
538526
USE_EMU_AVX: 0
539-
_DEBUG: 0
540527
run: |
541528
script/buildga.sh linux i386 || exit 1
542529
@@ -561,6 +548,5 @@ jobs:
561548
USE_OPENMP: 0
562549
USE_PYXES: 1
563550
USE_EMU_AVX: 0
564-
_DEBUG: 0
565551
run: |
566552
script/buildga.sh raspberry armv6l || exit 1

script/buildga.cmd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,11 @@ IF "%~1"=="arm64" GOTO L06B
150150
IF "%~1" NEQ "x64" EXIT /b 1
151151
copy bin\windows\j64\jconsole.exe j64
152152
copy bin\windows\j64\*.dll j64
153+
@rem copy bin\windows\j64\jamalgam.exe j64
154+
IF "%USE_EMU_AVX%"=="0" GOTO L06C
155+
IF "%USE_PYXES%"=="0" GOTO L06C
153156
copy bin\windows\j64avx512\j.dll j64\javx512.dll
154157
copy bin\windows\j64avx2\j.dll j64\javx2.dll
155-
@rem copy bin\windows\j64\jamalgam.exe j64
156158
GOTO L06C
157159
:L06A
158160
copy bin\windows\j32\jconsole.exe j32

script/buildga.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ if [ $m64 -eq 1 ]; then
262262
fi
263263
fi
264264

265-
if [ "$2" = "x86_64" ] || [ "$1" = "darwin" ] || [ "$1" = "windows" ]; then
265+
if [ "$USE_PYXES" = "1" ] && [ "$USE_EMU_AVX" = "1" ] && ([ "$2" = "x86_64" ] || [ "$1" = "darwin" ] || [ "$1" = "windows" ]); then
266266
./clean.sh
267267
j64x=j64avx2 ./build_libj.sh
268268
./clean.sh

0 commit comments

Comments
 (0)