Skip to content

Commit 74918d4

Browse files
svenwoopsvenwoop
committed
one more fix for release builds using PowerShell
1 parent 0d70549 commit 74918d4

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎.gitlab-ci.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -375,37 +375,37 @@ nightly-linux-x64-RelWithDebInfo-CLANG4-ISPC1.9.1-AVX2-TBB2017-STATCOUNTER:
375375

376376
nightly-linux-x64-RelWithDebInfo-CLANG4-ISPC1.9.1-ISAS-SSE2-TBB2017:
377377
image: embreedocker/fedora:25
378-
script: "scripts/test.py platform:x64 build:RelWithDebInfo compiler:CLANG4 ispc:ispc1.9.1 isa:[SSE2] tasking:TBB2017 intensity:0"
378+
script: "scripts/test.py platform:x64 build:RelWithDebInfo compiler:CLANG4 ispc:ispc1.9.1 isas:SSE2 tasking:TBB2017 intensity:0"
379379
tags: [docker]
380380
only: [schedules]
381381

382382
nightly-linux-x64-RelWithDebInfo-CLANG4-ISPC1.9.1-ISAS-SSE42-TBB2017:
383383
image: embreedocker/fedora:25
384-
script: "scripts/test.py platform:x64 build:RelWithDebInfo compiler:CLANG4 ispc:ispc1.9.1 isa:[SSE42] tasking:TBB2017 intensity:0"
384+
script: "scripts/test.py platform:x64 build:RelWithDebInfo compiler:CLANG4 ispc:ispc1.9.1 isas:SSE42 tasking:TBB2017 intensity:0"
385385
tags: [docker]
386386
only: [schedules]
387387

388388
nightly-linux-x64-RelWithDebInfo-CLANG4-ISPC1.9.1-ISAS-AVX-TBB2017:
389389
image: embreedocker/fedora:25
390-
script: "scripts/test.py platform:x64 build:RelWithDebInfo compiler:CLANG4 ispc:ispc1.9.1 isa:[AVX] tasking:TBB2017 intensity:0"
390+
script: "scripts/test.py platform:x64 build:RelWithDebInfo compiler:CLANG4 ispc:ispc1.9.1 isas:AVX tasking:TBB2017 intensity:0"
391391
tags: [docker]
392392
only: [schedules]
393393

394394
nightly-linux-x64-RelWithDebInfo-CLANG4-ISPC1.9.1-ISAS-AVX2-TBB2017:
395395
image: embreedocker/fedora:25
396-
script: "scripts/test.py platform:x64 build:RelWithDebInfo compiler:CLANG4 ispc:ispc1.9.1 isa:[AVX2] tasking:TBB2017 intensity:0"
396+
script: "scripts/test.py platform:x64 build:RelWithDebInfo compiler:CLANG4 ispc:ispc1.9.1 isas:AVX2 tasking:TBB2017 intensity:0"
397397
tags: [docker]
398398
only: [schedules]
399399

400400
nightly-linux-x64-RelWithDebInfo-CLANG4-ISPC1.9.1-ISAS-AVX512KNL-TBB2017:
401401
image: embreedocker/fedora:25
402-
script: "scripts/test.py platform:x64 build:RelWithDebInfo compiler:CLANG4 ispc:ispc1.9.1 isa:[AVX512KNL] tasking:TBB2017 intensity:0"
402+
script: "scripts/test.py platform:x64 build:RelWithDebInfo compiler:CLANG4 ispc:ispc1.9.1 isas:AVX512KNL tasking:TBB2017 intensity:0"
403403
tags: [docker]
404404
only: [schedules]
405405

406406
nightly-linux-x64-RelWithDebInfo-CLANG4-ISPC1.9.1-ISAS-AVX512SKX-TBB2017:
407407
image: embreedocker/fedora:25
408-
script: "scripts/test.py platform:x64 build:RelWithDebInfo compiler:CLANG4 ispc:ispc1.9.1 isa:[AVX512SKX] tasking:TBB2017 intensity:0"
408+
script: "scripts/test.py platform:x64 build:RelWithDebInfo compiler:CLANG4 ispc:ispc1.9.1 isas:AVX512SKX tasking:TBB2017 intensity:0"
409409
tags: [docker]
410410
only: [schedules]
411411

@@ -454,7 +454,7 @@ nightly-linux-x64-RelWithDebInfo-CLANG4-ISPC1.9.1-AVX2-TBB2017-USERGEOM:
454454
####################################################################
455455

456456
release-windows-x64-Release-ICC17-ISPC1.9.1-TBB2017-PACKAGE-ZIP:
457-
script: "python scripts\\test.py platform:x64 build:Release compiler:ICC17 ispc:ispc1.9.1 isa:[SSE2,SSE42,AVX,AVX2,AVX512SKX] tasking:TBB2017 intensity:4 package:ZIP"
457+
script: "python scripts\\test.py platform:x64 build:Release compiler:ICC17 ispc:ispc1.9.1 isas:SSE2-SSE42-AVX-AVX2-AVX512SKX tasking:TBB2017 intensity:4 package:ZIP"
458458
tags: [win7, icc17]
459459
only: [web]
460460
artifacts:
@@ -464,7 +464,7 @@ release-windows-x64-Release-ICC17-ISPC1.9.1-TBB2017-PACKAGE-ZIP:
464464
expire_in: 2 mos
465465

466466
release-windows-x64-Release-ICC17-ISPC1.9.1-TBB2017-PACKAGE-MSI:
467-
script: "python scripts\\test.py platform:x64 build:Release compiler:ICC17 ispc:ispc1.9.1 isa:[SSE2,SSE42,AVX,AVX2,AVX512SKX] tasking:TBB2017 intensity:4 package:MSI"
467+
script: "python scripts\\test.py platform:x64 build:Release compiler:ICC17 ispc:ispc1.9.1 isas:SSE2-SSE42-AVX-AVX2-AVX512SKX tasking:TBB2017 intensity:4 package:MSI"
468468
tags: [win7, icc17]
469469
only: [web]
470470
artifacts:
@@ -474,7 +474,7 @@ release-windows-x64-Release-ICC17-ISPC1.9.1-TBB2017-PACKAGE-MSI:
474474
expire_in: 2 mos
475475

476476
release-macosx-x64-Release-ICC16-ISPC1.9.1-TBB2017-PACKAGE-ZIP:
477-
script: "scripts/test.py platform:x64 build:Release compiler:ICC16 ispc:ispc1.9.1 isa:[SSE2,SSE42,AVX,AVX2] tasking:TBB2017 intensity:4 package:ZIP"
477+
script: "scripts/test.py platform:x64 build:Release compiler:ICC16 ispc:ispc1.9.1 isas:SSE2-SSE42-AVX-AVX2 tasking:TBB2017 intensity:4 package:ZIP"
478478
tags: [mac, icc16]
479479
only: [web]
480480
artifacts:
@@ -484,7 +484,7 @@ release-macosx-x64-Release-ICC16-ISPC1.9.1-TBB2017-PACKAGE-ZIP:
484484
expire_in: 2 mos
485485

486486
release-macosx-x64-Release-ICC16-ISPC1.9.1-TBB-PACKAGE-PKG:
487-
script: "scripts/test.py platform:x64 build:Release compiler:ICC16 ispc:ispc1.9.1 isa:[SSE2,SSE42,AVX,AVX2] tasking:TBB intensity:4 package:PKG"
487+
script: "scripts/test.py platform:x64 build:Release compiler:ICC16 ispc:ispc1.9.1 isas:SSE2-SSE42-AVX-AVX2 tasking:TBB intensity:4 package:PKG"
488488
tags: [mac, icc16]
489489
only: [web]
490490
artifacts:
@@ -495,7 +495,7 @@ release-macosx-x64-Release-ICC16-ISPC1.9.1-TBB-PACKAGE-PKG:
495495

496496
release-linux-x64-Release-ICC17-ISPC1.9.1-TBB2017-PACKAGE-ZIP:
497497
image: embreedocker/centos:6.0
498-
script: "scripts/test.py platform:x64 build:Release compiler:ICC17 ispc:ispc1.9.1 isa:[SSE2,SSE42,AVX,AVX2,AVX512KNL,AVX512SKX] tasking:TBB2017 intensity:4 package:ZIP"
498+
script: "scripts/test.py platform:x64 build:Release compiler:ICC17 ispc:ispc1.9.1 isas:SSE2-SSE42-AVX-AVX2-AVX512KNL-AVX512SKX tasking:TBB2017 intensity:4 package:ZIP"
499499
tags: [docker]
500500
only: [web]
501501
artifacts:
@@ -506,7 +506,7 @@ release-linux-x64-Release-ICC17-ISPC1.9.1-TBB2017-PACKAGE-ZIP:
506506

507507
release-linux-x64-Release-ICC17-ISPC1.9.1-TBB-PACKAGE-RPM:
508508
image: embreedocker/centos:6.0
509-
script: "scripts/test.py platform:x64 build:Release compiler:ICC17 ispc:ispc1.9.1 isa:[SSE2,SSE42,AVX,AVX2,AVX512KNL,AVX512SKX] tasking:TBB intensity:4 package:RPM"
509+
script: "scripts/test.py platform:x64 build:Release compiler:ICC17 ispc:ispc1.9.1 isas:SSE2-SSE42-AVX-AVX2-AVX512KNL-AVX512SKX tasking:TBB intensity:4 package:RPM"
510510
tags: [docker]
511511
only: [web]
512512
artifacts:

‎scripts/test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,8 @@ def parseCommandLine(argv):
379379
p = argv[0].split(":")
380380
if p[0] == "intensity":
381381
g_intensity = int(p[1])
382-
if p[1].startswith('[') and p[1].endswith(']'):
383-
g_config[p[0]] = p[1][1:-1].split(',')
382+
if p[0] == "isas":
383+
g_config["isa"] = p[1].split('-')
384384
else:
385385
g_config[p[0]] = p[1]
386386
parseCommandLine(argv[1:len(argv)])

0 commit comments

Comments
 (0)