Skip to content

Commit

Permalink
change main branch version to SNAPSHOT-2.5.0/2.5.0.dev0 (intel#9439)
Browse files Browse the repository at this point in the history
  • Loading branch information
@liu-shaojun
liu-shaojun authored Nov 13, 2023
1 parent 333ce0e commit 82cefac
Show file tree
Hide file tree
Showing 18 changed files with 53 additions and 53 deletions.
2 changes: 1 addition & 1 deletion apps/SimpleMlp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-dllib-spark_3.1.3</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
Expand Down
6 changes: 3 additions & 3 deletions apps/model-inference-examples/recommendation-inference/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-dllib-spark_3.1.3</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-orca-spark_3.1.3</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-serving-spark_3.1.3</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
Expand Down
6 changes: 3 additions & 3 deletions apps/model-inference-examples/text-classification-inference/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,17 @@
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-dllib-spark_3.1.3</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-orca-spark_3.1.3</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-serving-spark_3.1.3</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
Expand Down
6 changes: 3 additions & 3 deletions apps/model-inference-examples/text-classification-training/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-dllib-spark_3.1.3</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-orca-spark_3.1.3</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-serving-spark_3.1.3</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
Expand Down
2 changes: 1 addition & 1 deletion python/dllib/src/setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def setup_package():
scripts=scripts,
install_requires=[
'numpy>=1.19.5', 'pyspark=='+PYSPARK_VERSION , 'conda-pack==0.3.1',
'six>=1.10.0', 'bigdl-core==2.4.0.dev0'],
'six>=1.10.0', 'bigdl-core==2.5.0.dev0'],
dependency_links=['https://d3kbcqa49mib13.cloudfront.net/spark-2.0.0-bin-hadoop2.7.tgz'],
include_package_data=True,
package_data={"bigdl.share.dllib": ['lib/bigdl-dllib*.jar', 'conf/*',
Expand Down
2 changes: 1 addition & 1 deletion python/orca/src/setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def setup_package():
url='https://github.com/intel-analytics/BigDL',
packages=get_bigdl_packages(),
install_requires=['packaging', 'filelock',
'bigdl-tf==2.4.0.dev0', 'bigdl-math==2.4.0.dev0',
'bigdl-tf==2.5.0.dev0', 'bigdl-math==2.5.0.dev0',
'bigdl-dllib=='+VERSION, 'pyzmq'],
extras_require={'ray': RAY_DEP,
'automl': AUTOML_DEP,
Expand Down
2 changes: 1 addition & 1 deletion python/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.0.dev0
2.5.0.dev0
16 changes: 8 additions & 8 deletions scala/assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-parent-spark_${spark.version}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-dllib-spark_${spark.version}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.apache.spark</groupId>
Expand All @@ -35,12 +35,12 @@
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-friesian-spark_${spark.version}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-orca-spark_${spark.version}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.apache.spark</groupId>
Expand All @@ -55,17 +55,17 @@
<dependency>
<groupId>com.intel.analytics.zoo</groupId>
<artifactId>zoo-core-tfnet-linux</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.intel.analytics.zoo</groupId>
<artifactId>zoo-core-tfnet-mac</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-ppml-spark_${spark.version}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.apache.spark</groupId>
Expand All @@ -80,7 +80,7 @@
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-serving-spark_${spark.version}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.apache.spark</groupId>
Expand Down
2 changes: 1 addition & 1 deletion scala/common/spark-version/2.0/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>spark-version</artifactId>
<groupId>com.intel.analytics.bigdl</groupId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion scala/common/spark-version/3.0/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>spark-version</artifactId>
<groupId>com.intel.analytics.bigdl</groupId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion scala/common/spark-version/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>bigdl-parent-spark_${spark.version}</artifactId>
<groupId>com.intel.analytics.bigdl</groupId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions scala/dllib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>bigdl-parent-spark_${spark.version}</artifactId>
<groupId>com.intel.analytics.bigdl</groupId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -186,7 +186,7 @@
<dependency>
<groupId>com.intel.analytics.bigdl.core.dist</groupId>
<artifactId>all</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>${bigdl-core-all-scope}</scope>
</dependency>
<dependency>
Expand Down
14 changes: 7 additions & 7 deletions scala/friesian/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>bigdl-parent-spark_${spark.version}</artifactId>
<groupId>com.intel.analytics.bigdl</groupId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -58,25 +58,25 @@
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-dllib-spark_${spark.version}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>${dllib.scope}</scope>
</dependency>
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-orca-spark_${spark.version}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>${orca.scope}</scope>
</dependency>
<dependency>
<groupId>com.intel.analytics.bigdl.core.dist</groupId>
<artifactId>all</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>${bigdl-core-all-scope}</scope>
</dependency>
<dependency>
<groupId>com.intel.analytics.zoo</groupId>
<artifactId>${core.artifactId}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<type>${core.dependencyType}</type>
<scope>${core.scope}</scope>
</dependency>
Expand Down Expand Up @@ -222,7 +222,7 @@
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-grpc-spark_${spark.version}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>${serving.scope}</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -642,7 +642,7 @@
<dependency>
<groupId>com.intel.analytics.bigdl.core.dist</groupId>
<artifactId>${os-flag}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion scala/grpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>bigdl-parent-spark_${spark.version}</artifactId>
<groupId>com.intel.analytics.bigdl</groupId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
20 changes: 10 additions & 10 deletions scala/orca/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>bigdl-parent-spark_${spark.version}</artifactId>
<groupId>com.intel.analytics.bigdl</groupId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -27,13 +27,13 @@
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-dllib-spark_${spark.version}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.intel.analytics.bigdl.core.dist</groupId>
<artifactId>all</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>${bigdl-core-all-scope}</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -288,7 +288,7 @@
<!--<dependency>-->
<!--<groupId>com.intel.analytics.bigdl.core.dist</groupId>-->
<!--<artifactId>all</artifactId>-->
<!--<version>2.4.0-SNAPSHOT</version>-->
<!--<version>2.5.0-SNAPSHOT</version>-->
<!--<scope>${bigdl-core-all-scope}</scope>-->
<!--</dependency>-->
<!--<dependency>-->
Expand Down Expand Up @@ -568,7 +568,7 @@
<dependency>
<groupId>com.intel.analytics.bigdl.core.dist</groupId>
<artifactId>${os-flag}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
</dependencies>
Expand Down Expand Up @@ -605,7 +605,7 @@
<dependency>
<groupId>com.intel.analytics.zoo</groupId>
<artifactId>zoo-core-dist-all</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
</dependencies>
Expand All @@ -621,7 +621,7 @@
<dependency>
<groupId>com.intel.analytics.zoo</groupId>
<artifactId>zoo-core-dist-linux64</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<type>pom</type>
<exclusions>
<exclusion>
Expand All @@ -644,7 +644,7 @@
<dependency>
<groupId>com.intel.analytics.zoo</groupId>
<artifactId>zoo-core-dist-mac</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<type>pom</type>
<exclusions>
<exclusion>
Expand All @@ -657,12 +657,12 @@
<dependency>
<groupId>com.intel.analytics.zoo</groupId>
<artifactId>zoo-core-mkl-linux</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.intel.analytics.zoo</groupId>
<artifactId>zoo-core-pmem-java-linux</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
</dependencies>
</profile>
Expand Down
2 changes: 1 addition & 1 deletion scala/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-parent-spark_${spark.version}</artifactId>
<packaging>pom</packaging>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>

<name>BigDL</name>
<description>Big Data AI platform for distributed TensorFlow and PyTorch on Apache Spark.</description>
Expand Down
8 changes: 4 additions & 4 deletions scala/ppml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>bigdl-parent-spark_${spark.version}</artifactId>
<groupId>com.intel.analytics.bigdl</groupId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>bigdl-ppml-spark_${spark.version}</artifactId>
Expand Down Expand Up @@ -245,18 +245,18 @@
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-dllib-spark_${spark.version}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.intel.analytics.bigdl.core.dist</groupId>
<artifactId>all</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>${bigdl-core-all-scope}</scope>
</dependency>
<dependency>
<groupId>com.intel.analytics.bigdl</groupId>
<artifactId>bigdl-grpc-spark_${spark.version}</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
Loading

0 comments on commit 82cefac

Please sign in to comment.