Skip to content

Commit

Permalink
address branch-2308 CVE/PCA/CMake issues (#308)
Browse files Browse the repository at this point in the history
* update snapshot version for 2308 dev branch

Signed-off-by: liyuan <[email protected]>

* add comments that pca demo only works with 2304 rapids-ml or previous version

Signed-off-by: liyuan <[email protected]>

* address CVE issue

Signed-off-by: liyuan <[email protected]>

* fix NV CVE issues

Signed-off-by: liyuan <[email protected]>

* update CMAKE version

Signed-off-by: liyuan <[email protected]>

* update the node to avoid updating the rel version later

Signed-off-by: liyuan <[email protected]>

* update all cmake related files

Signed-off-by: liyuan <[email protected]>

* update spark-ml version

Signed-off-by: liyuan <[email protected]>

* update spark-ml version

Signed-off-by: liyuan <[email protected]>

* add note for PCA demo

Signed-off-by: liyuan <[email protected]>

---------

Signed-off-by: liyuan <[email protected]>
  • Loading branch information
nvliyuan authored Jul 10, 2023
1 parent 705063b commit a6f421c
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion examples/MIG-Support/device-plugins/gpu-mig/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</licenses>

<properties>
<yarn.version>3.3.0</yarn.version>
<yarn.version>3.3.6</yarn.version>
<java.version>1.8</java.version>
<maven.compiler.version>3.8.1</maven.compiler.version>
<maven.jar.plugin.version>3.2.0</maven.jar.plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion examples/ML+DL-Examples/Spark-cuML/pca/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN conda install -c conda-forge openjdk=8 maven=3.8.1 -y
RUN conda install -c rapidsai-nightly -c nvidia -c conda-forge cudf=${BRANCH_VER} python=3.8 -y

RUN wget --quiet \
https://github.com/Kitware/CMake/releases/download/v3.21.3/cmake-3.21.3-linux-x86_64.tar.gz \
https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-linux-x86_64.tar.gz \
&& tar -xzf cmake-3.21.3-linux-x86_64.tar.gz \
&& rm -rf cmake-3.21.3-linux-x86_64.tar.gz

Expand Down
4 changes: 2 additions & 2 deletions examples/ML+DL-Examples/Spark-cuML/pca/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ User can also download the release jar from Maven central:

[rapids-4-spark_2.12-23.06.0.jar](https://repo1.maven.org/maven2/com/nvidia/rapids-4-spark_2.12/23.06.0/rapids-4-spark_2.12-23.06.0.jar)

Note: This demo could only work with v23.04.0 version or previous.
Note: This demo could only work with v22.02.0 version.

## Sample code

User can find sample scala code in [`main.scala`](main.scala). In the sample code, we will generate random data with 2048 feature dimensions. Then we use PCA to reduce number of features to 3.

Just copy the sample code into the spark-shell laucnhed according to [this section](https://github.com/NVIDIA/spark-rapids-ml#how-to-use) and REPL will give out the algorithm results.
Just copy the sample code into the spark-shell launched according to [this section](https://github.com/NVIDIA/spark-rapids-ml#how-to-use) and REPL will give out the algorithm results.

## Notebook

Expand Down
1 change: 1 addition & 0 deletions examples/ML+DL-Examples/Spark-cuML/pca/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-ml_2.12</artifactId>
<version>23.04.0-SNAPSHOT</version>
<!--The last rapids-4-spark-ml release version is 22.02.0, snapshot version is 23.04.0-SNPASHOT!-->
</dependency>
</dependencies>

Expand Down
1 change: 1 addition & 0 deletions examples/ML+DL-Examples/Spark-cuML/pca/spark-submit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

ML_JAR=/root/.m2/repository/com/nvidia/rapids-4-spark-ml_2.12/23.04.0-SNAPSHOT/rapids-4-spark-ml_2.12-23.04.0-SNAPSHOT.jar
PLUGIN_JAR=/root/.m2/repository/com/nvidia/rapids-4-spark_2.12/23.08.0-SNAPSHOT/rapids-4-spark_2.12-23.08.0-SNAPSHOT.jar
Note: The last rapids-4-spark-ml release version is 22.02.0, snapshot version is 23.04.0-SNPASHOT.

$SPARK_HOME/bin/spark-submit \
--master spark://127.0.0.1:7077 \
Expand Down
2 changes: 1 addition & 1 deletion examples/UDF-Examples/RAPIDS-accelerated-UDFs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ CUDA_VERSION_MINOR=$(echo $CUDA_VERSION | tr -d '.' | cut -c 3); \
# Set JDK8 as the default Java
&& update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java

ARG CMAKE_VERSION=3.23.3
ARG CMAKE_VERSION=3.26.4

# Install CMake
RUN cd /tmp \
Expand Down
2 changes: 1 addition & 1 deletion examples/UDF-Examples/Spark-cuSpatial/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN conda --version
RUN conda install -c conda-forge openjdk=8 maven=3.8.1 -y

RUN wget --quiet \
https://github.com/Kitware/CMake/releases/download/v3.21.3/cmake-3.21.3-linux-x86_64.tar.gz \
https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-linux-x86_64.tar.gz \
&& tar -xzf cmake-3.21.3-linux-x86_64.tar.gz \
&& rm -rf cmake-3.21.3-linux-x86_64.tar.gz

Expand Down
2 changes: 1 addition & 1 deletion examples/XGBoost-Examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
<version>3.0.5</version>
<version>3.2.15</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit a6f421c

Please sign in to comment.