Merge pull request #27 from Eugene-Mark/naming

[PMEM-SHUFFLE] Change artifact name to make it compatible with naming…
oap-project · Jun 17, 2021 · 056e111 · 056e111
2 parents 621280b + 74e2ae7
commit 056e111
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -499,9 +499,8 @@ $HOME/miniconda2/envs/oapenv/bin/pmempool rm ${device_name}
 #### Enable RPMemShuffle
 ```bash
 spark.shuffle.manager		      org.apache.spark.shuffle.pmof.PmofShuffleManager
-spark.driver.extraClassPath           /$path/oap-shuffle/RPMem-shuffle/core/target/oap-rpmem-shuffle-java-<version>-jar-with-dependencies.jar
-spark.executor.extraClassPath         /$path/oap-shuffle/RPMem-shuffle/core/target/oap-rpmem-shuffle-java-<version>-jar-with-dependencies.jar
-
+spark.driver.extraClassPath           /$path/oap-shuffle/RPMem-shuffle/core/target/oap-rpmem-shuffle-java-<version>-with-spark<spark.version>.jar
+spark.executor.extraClassPath         /$path/oap-shuffle/RPMem-shuffle/core/target/oap-rpmem-shuffle-java-<version>-with-spark<spark.version>.jar
 ```
 #### Switch On/Off PMem and RDMA
 ```bash
@@ -772,8 +771,8 @@ spark.yarn.driver.memoryOverhead 5g
 
 spark.shuffle.compress                                      true
 spark.io.compression.codec                                  snappy
-spark.driver.extraClassPath                                 $HOME/miniconda2/envs/oapenv/oap_jars/oap-rpmem-shuffle-java-<version>-jar-with-dependencies.jar
-spark.executor.extraClassPath                               $HOME/miniconda2/envs/oapenv/oap_jars/oap-rpmem-shuffle-java-<version>-jar-with-dependencies.jar
+spark.driver.extraClassPath                                 $HOME/miniconda2/envs/oapenv/oap_jars/oap-rpmem-shuffle-java-<version>-with-spark<spark.version>.jar
+spark.executor.extraClassPath                               $HOME/miniconda2/envs/oapenv/oap_jars/oap-rpmem-shuffle-java-<version>-with-spark<spark.version>.jar
 spark.shuffle.manager                                       org.apache.spark.shuffle.pmof.PmofShuffleManager
 spark.shuffle.pmof.enable_rdma                              true
 spark.shuffle.pmof.enable_pmem                              true

diff --git a/core/pom.xml b/core/pom.xml
@@ -15,6 +15,10 @@
     <artifactId>oap-rpmem-shuffle-java</artifactId>
     <version>1.1.1</version>
 
+    <properties>
+      <spark.version>3.1.1</spark.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.spark</groupId>
@@ -132,7 +136,7 @@
                                 </filter>
                             </filters>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <shadedClassifierName>jar-with-dependencies</shadedClassifierName>
+                            <shadedClassifierName>with-spark${spark.version}</shadedClassifierName>
                         </configuration>
                     </execution>
                 </executions>