Skip to content

Commit 243ff1c

Browse files
authored
Merge branch 'apache:main' into main
2 parents fed2aa4 + 692dcc3 commit 243ff1c

File tree

90 files changed

+3194
-6864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+3194
-6864
lines changed

.github/workflows/javaTests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
run: mvn jacoco:report
150150

151151
- name: Upload coverage to Codecov
152-
uses: codecov/[email protected].2
152+
uses: codecov/[email protected].3
153153
if: github.repository_owner == 'apache'
154154
with:
155155
fail_ci_if_error: false

bin/systemds

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ if [ $WORKER == 1 ]; then
413413
print_out "# starting Federated worker on port $PORT"
414414
CMD=" \
415415
java $SYSTEMDS_STANDALONE_OPTS \
416+
--add-modules=jdk.incubator.vector \
416417
$LOG4JPROPFULL \
417418
-jar $SYSTEMDS_JAR_FILE \
418419
-w $PORT \
@@ -422,6 +423,7 @@ elif [ "$FEDMONITORING" == 1 ]; then
422423
print_out "# starting Federated backend monitoring on port $PORT"
423424
CMD=" \
424425
java $SYSTEMDS_STANDALONE_OPTS \
426+
--add-modules=jdk.incubator.vector \
425427
$LOG4JPROPFULL \
426428
-jar $SYSTEMDS_JAR_FILE \
427429
-fedMonitoring $PORT \
@@ -433,6 +435,7 @@ elif [ $SYSDS_DISTRIBUTED == 0 ]; then
433435
CMD=" \
434436
java $SYSTEMDS_STANDALONE_OPTS \
435437
$LOG4JPROPFULL \
438+
--add-modules=jdk.incubator.vector \
436439
-jar $SYSTEMDS_JAR_FILE \
437440
-f $SCRIPT_FILE \
438441
-exec $SYSDS_EXEC_MODE \
@@ -442,6 +445,7 @@ else
442445
print_out "# Running script $SCRIPT_FILE distributed with opts: $*"
443446
CMD=" \
444447
spark-submit $SYSTEMDS_DISTRIBUTED_OPTS \
448+
--add-modules=jdk.incubator.vector \
445449
$SYSTEMDS_JAR_FILE \
446450
-f $SCRIPT_FILE \
447451
-exec $SYSDS_EXEC_MODE \

docker/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# Build the docker containers
2424

2525
# The first build is for running systemds through docker.
26-
docker image build -f docker/sysds.Dockerfile -t apache/systemds:latest .
26+
# docker image build -f docker/sysds.Dockerfile -t apache/systemds:latest .
2727

2828
# The second build is for testing systemds. This image installs the R dependencies needed to run the tests.
2929
docker image build -f docker/testsysds.Dockerfile -t apache/systemds:testing-latest .

docker/entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ export MAVEN_OPTS="-Xmx512m"
3030

3131
log="/tmp/sysdstest.log"
3232
mvn -ntp -B test-compile 2>&1 | grep -E "BUILD|Total time:|---|Building SystemDS"
33-
mvn -ntp -B test -D maven.test.skip=false -D automatedtestbase.outputbuffering=true -D test=$1 2>&1 | grep -v "already exists in destination." | tee $log
33+
mvn -ntp -B test -D maven.test.skip=false -D automatedtestbase.outputbuffering=true -D test=$1 2>&1 \
34+
| grep -v "already exists in destination." \
35+
| grep -v 'WARNING: Using incubator modules' | tee $log
3436

3537
# Merge Federated test runs.
3638
[ -f target/jacoco.exec ] && mv target/jacoco.exec target/jacoco_main.exec

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
--add-opens=java.base/java.lang.ref=ALL-UNNAMED
9393
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED
9494
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
95+
--add-modules=jdk.incubator.vector
9596
</jvm.addopens>
9697
</properties>
9798

@@ -357,6 +358,9 @@
357358
<source>${java.level}</source>
358359
<target>${java.level}</target>
359360
<release>${java.level}</release>
361+
<compilerArgs>
362+
<arg>--add-modules=jdk.incubator.vector</arg>
363+
</compilerArgs>
360364
</configuration>
361365
</plugin>
362366

@@ -904,6 +908,7 @@
904908
<notimestamp>true</notimestamp>
905909
<failOnWarnings>false</failOnWarnings>
906910
<quiet>true</quiet>
911+
<additionalJOption>--add-modules=jdk.incubator.vector</additionalJOption>
907912
<skip>${doc.skip}</skip>
908913
<show>public</show>
909914
<source>${java.level}</source>

0 commit comments

Comments
 (0)