You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by de...@apache.org on 2017/06/08 22:23:41 UTC
systemml git commit: [SYSTEMML-1670] Migrate incubator-systemml to
systemml in dev
Repository: systemml
Updated Branches:
refs/heads/master 0cd3905f5 -> 486f2e188
[SYSTEMML-1670] Migrate incubator-systemml to systemml in dev
Update 'incubator-systemml' references to 'systemml'.
Remove '-incubating' extension.
Update 'dist/dev/incubator/systemml' to 'dist/dev/systemml'.
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/486f2e18
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/486f2e18
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/486f2e18
Branch: refs/heads/master
Commit: 486f2e188e459e813108efc890f94d4871775d1e
Parents: 0cd3905
Author: Deron Eriksson <de...@us.ibm.com>
Authored: Thu Jun 8 15:20:07 2017 -0700
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Thu Jun 8 15:20:07 2017 -0700
----------------------------------------------------------------------
dev/release/release-build.sh | 40 ++++++++--------
dev/release/release-verify.sh | 8 ++--
dev/release/src/test/bin/verifyBuild.sh | 48 ++++++++++----------
.../sysml/validation/ValidateLicAndNotice.java | 2 +-
4 files changed, 49 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/486f2e18/dev/release/release-build.sh
----------------------------------------------------------------------
diff --git a/dev/release/release-build.sh b/dev/release/release-build.sh
index 091b641..040ec36 100755
--- a/dev/release/release-build.sh
+++ b/dev/release/release-build.sh
@@ -29,10 +29,10 @@ usage: release-build.sh [--release-prepare | --release-publish | --release-snaps
DESCRIPTION
Use maven infrastructure to create a project release package and publish
-to staging release location (https://dist.apache.org/repos/dist/dev/incubator/systemml/)
+to staging release location (https://dist.apache.org/repos/dist/dev/systemml/)
and maven staging release repository.
---release-prepare --releaseVersion="0.11.0-incubating" --developmentVersion="0.11.0-SNAPSHOT" [--releaseRc="rc1"] [--tag="v0.11.0-incubating"] [--gitCommitHash="a874b73"]
+--release-prepare --releaseVersion="0.11.0" --developmentVersion="0.11.0-SNAPSHOT" [--releaseRc="rc1"] [--tag="v0.11.0"] [--gitCommitHash="a874b73"]
This form execute maven release:prepare and upload the release candidate distribution
to the staging release location.
@@ -57,15 +57,15 @@ GPG_PASSPHRASE - Passphrase for GPG key used to sign release
EXAMPLES
-release-build.sh --release-prepare --releaseVersion="0.11.0-incubating" --developmentVersion="0.12.0-SNAPSHOT"
-release-build.sh --release-prepare --releaseVersion="0.11.0-incubating" --developmentVersion="0.12.0-SNAPSHOT" --releaseRc="rc1" --tag="v0.11.0-incubating-rc1"
-release-build.sh --release-prepare --releaseVersion="0.11.0-incubating" --developmentVersion="0.12.0-SNAPSHOT" --releaseRc="rc1" --tag="v0.11.0-incubating-rc1" --gitCommitHash="a874b73" --dryRun
+release-build.sh --release-prepare --releaseVersion="0.11.0" --developmentVersion="0.12.0-SNAPSHOT"
+release-build.sh --release-prepare --releaseVersion="0.11.0" --developmentVersion="0.12.0-SNAPSHOT" --releaseRc="rc1" --tag="v0.11.0-rc1"
+release-build.sh --release-prepare --releaseVersion="0.11.0" --developmentVersion="0.12.0-SNAPSHOT" --releaseRc="rc1" --tag="v0.11.0-rc1" --gitCommitHash="a874b73" --dryRun
# Create 0.12 RC2 builds from branch-0.12
-./release-build.sh --release-prepare --releaseVersion="0.12.0-incubating" --developmentVersion="0.12.1-incubating-SNAPSHOT" --releaseRc="rc2" --tag="v0.12.0-incubating-rc2" --gitCommitHash="branch-0.12"
+./release-build.sh --release-prepare --releaseVersion="0.12.0" --developmentVersion="0.12.1-SNAPSHOT" --releaseRc="rc2" --tag="v0.12.0-rc2" --gitCommitHash="branch-0.12"
release-build.sh --release-publish --gitCommitHash="a874b73"
-release-build.sh --release-publish --gitTag="v0.11.0-incubating-rc1"
+release-build.sh --release-publish --gitTag="v0.11.0-rc1"
release-build.sh --release-snapshot
release-build.sh --release-snapshot --gitCommitHash="a874b73"
@@ -202,7 +202,7 @@ if [ -z "$RELEASE_TAG" ]; then
RELEASE_TAG="v$RELEASE_VERSION-$RELEASE_RC"
fi
-RELEASE_STAGING_LOCATION="https://dist.apache.org/repos/dist/dev/incubator/systemml/"
+RELEASE_STAGING_LOCATION="https://dist.apache.org/repos/dist/dev/systemml/"
echo " "
@@ -228,8 +228,8 @@ function checkout_code {
rm -rf $RELEASE_WORK_DIR
mkdir -p $RELEASE_WORK_DIR
cd $RELEASE_WORK_DIR
- git clone https://git-wip-us.apache.org/repos/asf/incubator-systemml.git
- cd incubator-systemml
+ git clone https://git-wip-us.apache.org/repos/asf/systemml.git
+ cd systemml
git checkout $GIT_REF
git_hash=`git rev-parse --short HEAD`
echo "Checked out SystemML git hash $git_hash"
@@ -245,7 +245,7 @@ if [[ "$RELEASE_PREPARE" == "true" ]]; then
echo "Preparing release $RELEASE_VERSION"
# Checkout code
checkout_code
- cd $RELEASE_WORK_DIR/incubator-systemml
+ cd $RELEASE_WORK_DIR/systemml
# Build and prepare the release
$MVN $PUBLISH_PROFILES release:clean release:prepare $DRY_RUN -Darguments="-Dgpg.passphrase=\"$GPG_PASSPHRASE\" -DskipTests" -DreleaseVersion="$RELEASE_VERSION" -DdevelopmentVersion="$DEVELOPMENT_VERSION" -Dtag="$RELEASE_TAG"
@@ -267,11 +267,11 @@ if [[ "$RELEASE_PREPARE" == "true" ]]; then
exit 5
- # Update dev/release/target/release/incubator-systemml/pom.xml with similar to following contents which is for 0.13.0 RC1
- # Update <version>0.13.0-incubating</version>
- # Update <tag>v0.13.0-incubating-rc1</tag>
+ # Update dev/release/target/release/systemml/pom.xml with similar to following contents which is for 0.13.0 RC1
+ # Update <version>0.13.0</version>
+ # Update <tag>v0.13.0-rc1</tag>
- cd $RELEASE_WORK_DIR/incubator-systemml
+ cd $RELEASE_WORK_DIR/systemml
## Rerunning mvn with clean and package goals, as release:prepare changes ordeer for some dependencies like unpack and shade.
$MVN $PUBLISH_PROFILES clean package $DRY_RUN -Darguments="-Dgpg.passphrase=\"$GPG_PASSPHRASE\" -DskipTests" -DreleaseVersion="$RELEASE_VERSION" -DdevelopmentVersion="$DEVELOPMENT_VERSION" -Dtag="$RELEASE_TAG"
@@ -280,9 +280,9 @@ if [[ "$RELEASE_PREPARE" == "true" ]]; then
if [ -z "$DRY_RUN" ]; then
svn co $RELEASE_STAGING_LOCATION svn-release-staging
mkdir -p svn-release-staging/$RELEASE_VERSION-$RELEASE_RC
- cp $RELEASE_WORK_DIR/incubator-systemml/target/systemml-*-bin.* svn-release-staging/$RELEASE_VERSION-$RELEASE_RC/
- cp $RELEASE_WORK_DIR/incubator-systemml/target/systemml-*-src.* svn-release-staging/$RELEASE_VERSION-$RELEASE_RC/
- cp $RELEASE_WORK_DIR/incubator-systemml/target/systemml-*-python.* svn-release-staging/$RELEASE_VERSION-$RELEASE_RC/
+ cp $RELEASE_WORK_DIR/systemml/target/systemml-*-bin.* svn-release-staging/$RELEASE_VERSION-$RELEASE_RC/
+ cp $RELEASE_WORK_DIR/systemml/target/systemml-*-src.* svn-release-staging/$RELEASE_VERSION-$RELEASE_RC/
+ cp $RELEASE_WORK_DIR/systemml/target/systemml-*-python.* svn-release-staging/$RELEASE_VERSION-$RELEASE_RC/
cd svn-release-staging/$RELEASE_VERSION-$RELEASE_RC/
rm -f *.asc
@@ -309,7 +309,7 @@ if [[ "$RELEASE_PUBLISH" == "true" ]]; then
echo "Preparing release $RELEASE_VERSION"
# Checkout code
checkout_code
- cd $RELEASE_WORK_DIR/incubator-systemml
+ cd $RELEASE_WORK_DIR/systemml
#Deploy scala 2.10
mvn -DaltDeploymentRepository=apache.releases.https::default::https://repository.apache.org/service/local/staging/deploy/maven2 clean package gpg:sign install:install deploy:deploy -DskiptTests -Darguments="-DskipTests -Dgpg.passphrase=\"$GPG_PASSPHRASE\"" -Dgpg.passphrase="$GPG_PASSPHRASE" $PUBLISH_PROFILES
@@ -323,7 +323,7 @@ fi
if [[ "$RELEASE_SNAPSHOT" == "true" ]]; then
# Checkout code
checkout_code
- cd $RELEASE_WORK_DIR/incubator-systemml
+ cd $RELEASE_WORK_DIR/systemml
CURRENT_VERSION=$($MVN help:evaluate -Dexpression=project.version \
| grep -v INFO | grep -v WARNING | grep -v Download)
http://git-wip-us.apache.org/repos/asf/systemml/blob/486f2e18/dev/release/release-verify.sh
----------------------------------------------------------------------
diff --git a/dev/release/release-verify.sh b/dev/release/release-verify.sh
index ad999f9..6071ae4 100755
--- a/dev/release/release-verify.sh
+++ b/dev/release/release-verify.sh
@@ -55,7 +55,7 @@ release-verify.sh --compile
# To verify release artifacts
release-verify.sh --verifyAll --tag=<tagName>
-e.g. ./release-verify.sh --verifyAll --tag=v0.14.0-incubating-rc4
+e.g. ./release-verify.sh --verifyAll --tag=v0.14.0-rc4
# To verify license and notices
release-verify.sh --verifyLic --distDir=<DistribLocation>
@@ -63,7 +63,7 @@ e.g. ./release-verify.sh --verifyLic --distDir=tmp/relValidation/downloads
# To verify binary files
release-verify.sh --verifyBin --tag=<tagName>
-e.g. ./release-verify.sh --verifyBin --tag=v0.14.0-incubating-rc4
+e.g. ./release-verify.sh --verifyBin --tag=v0.14.0-rc4
EOF
@@ -148,8 +148,8 @@ if [[ "$BIN_VERIFY" == "true" && -z "$TAG" ]]; then
fi
if [[ "$LIC_NOTICE_VERIFY" == "true" && -z "$DIST_DIR" ]]; then
- echo "`date +%Y-%m-%dT%H:%M:%S`: WARNING: Since --distDir has not passed, default distribution directory '$EXEC_DIR/target/release/incubator-systemml/target' has been used."
- DIST_DIR="$EXEC_DIR/target/release/incubator-systemml/target"
+ echo "`date +%Y-%m-%dT%H:%M:%S`: WARNING: Since --distDir has not passed, default distribution directory '$EXEC_DIR/target/release/systemml/target' has been used."
+ DIST_DIR="$EXEC_DIR/target/release/systemml/target"
elif [[ ${DIST_DIR:0:1} != "/" ]]; then
DIST_DIR="$ORIG_DIR/$DIST_DIR"
fi
http://git-wip-us.apache.org/repos/asf/systemml/blob/486f2e18/dev/release/src/test/bin/verifyBuild.sh
----------------------------------------------------------------------
diff --git a/dev/release/src/test/bin/verifyBuild.sh b/dev/release/src/test/bin/verifyBuild.sh
index b88b0c6..127b0b1 100755
--- a/dev/release/src/test/bin/verifyBuild.sh
+++ b/dev/release/src/test/bin/verifyBuild.sh
@@ -99,8 +99,8 @@ echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Cloning branch and building distribution
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Cloning branch and building distribution package." >> $OUT_FILE
echo "=========================================================================================================" >> $OUT_FILE
runCommand "cd $WORKING_DIR"
-runCommand "git clone https://github.com/apache/incubator-systemml.git"
-runCommand "cd incubator-systemml"
+runCommand "git clone https://github.com/apache/systemml.git"
+runCommand "cd systemml"
runCommand "git checkout tags/$TAG_NAME -b $TAG_NAME"
runCommand "mvn -Dmaven.repo.local=$HOME/.m2/temp-repo clean package -P distribution"
echo "=========================================================================================================" >> $OUT_FILE
@@ -119,15 +119,15 @@ echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Downloading binaries from distribution lo
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Downloading binaries from distribution location." >> $OUT_FILE
runCommand "mkdir -p $WORKING_DIR/downloads"
runCommand "cd $WORKING_DIR/downloads"
-runCommand "wget -r -nH -nd -np -R 'index.html*' https://dist.apache.org/repos/dist/dev/incubator/systemml/$DIST_DIR/"
+runCommand "wget -r -nH -nd -np -R 'index.html*' https://dist.apache.org/repos/dist/dev/systemml/$DIST_DIR/"
echo "=========================================================================================================" >> $OUT_FILE
## Verify binary tgz files
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Verifying binary tgz files..."
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Verifying binary tgz files..." >> $OUT_FILE
-runCommand "rm -rf systemml-$VER_NAME-incubating-bin"
-runCommand "tar -xvzf systemml-$VER_NAME-incubating-bin.tgz"
-runCommand "cd systemml-$VER_NAME-incubating-bin"
+runCommand "rm -rf systemml-$VER_NAME-bin"
+runCommand "tar -xvzf systemml-$VER_NAME-bin.tgz"
+runCommand "cd systemml-$VER_NAME-bin"
runCommand "echo \"print('hello world');\" > hello.dml"
runCommand "./runStandaloneSystemML.sh hello.dml"
runCommand "cd .."
@@ -135,9 +135,9 @@ runCommand "cd .."
## Verify binary zip files
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Verifying binary zip files..."
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Verifying binary zip files..." >> $OUT_FILE
-runCommand "rm -rf systemml-$VER_NAME-incubating-bin"
-runCommand "unzip systemml-$VER_NAME-incubating-bin.zip"
-runCommand "cd systemml-$VER_NAME-incubating-bin"
+runCommand "rm -rf systemml-$VER_NAME-bin"
+runCommand "unzip systemml-$VER_NAME-bin.zip"
+runCommand "cd systemml-$VER_NAME-bin"
runCommand "echo \"print('hello world');\" > hello.dml"
runCommand "./runStandaloneSystemML.sh hello.dml"
runCommand "cd .."
@@ -145,45 +145,45 @@ runCommand "cd .."
## Verify src tgz files
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Verifying source tgz files..."
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Verifying source tgz files..." >> $OUT_FILE
-runCommand "rm -rf systemml-$VER_NAME-incubating-src"
-runCommand "tar -xvzf systemml-$VER_NAME-incubating-src.tgz"
-runCommand "cd systemml-$VER_NAME-incubating-src"
+runCommand "rm -rf systemml-$VER_NAME-src"
+runCommand "tar -xvzf systemml-$VER_NAME-src.tgz"
+runCommand "cd systemml-$VER_NAME-src"
runCommand "mvn clean package -P distribution"
runCommand "cd target"
-runCommand "java -cp \"./lib/*:systemml-$VER_NAME-incubating.jar\" org.apache.sysml.api.DMLScript -s \"print('hello world');\""
+runCommand "java -cp \"./lib/*:systemml-$VER_NAME.jar\" org.apache.sysml.api.DMLScript -s \"print('hello world');\""
runCommand "java -cp \"./lib/*:SystemML.jar\" org.apache.sysml.api.DMLScript -s \"print('hello world');\""
runCommand "cd ../.."
## Verify Spark batch mode
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Verifying Spark batch mode..."
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Verifying Spark batch mode..." >> $OUT_FILE
-runCommand "cd systemml-$VER_NAME-incubating-bin/lib"
-runCommand "$SPARK_HOME/bin/spark-submit systemml-$VER_NAME-incubating.jar -s \"print('hello world');\" -exec hybrid_spark"
+runCommand "cd systemml-$VER_NAME-bin/lib"
+runCommand "$SPARK_HOME/bin/spark-submit systemml-$VER_NAME.jar -s \"print('hello world');\" -exec hybrid_spark"
## Verify Hadoop batch mode
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Verifying Hadoop batch mode..."
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Verifying Hadoop batch mode..." >> $OUT_FILE
-runCommand "$HADOOP_HOME/bin/hadoop jar systemml-$VER_NAME-incubating.jar -s \"print('hello world');\""
+runCommand "$HADOOP_HOME/bin/hadoop jar systemml-$VER_NAME.jar -s \"print('hello world');\""
runCommand "cd ../../"
## Verify Python scripts through spark-submit
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Verifying Python scripts..."
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Verifying Python scripts..." >> $OUT_FILE
-runCommand "pip install --upgrade systemml-$VER_NAME-incubating-python.tgz"
+runCommand "pip install --upgrade systemml-$VER_NAME-python.tgz"
runCommand "cd ../../../"
runCommand "$SPARK_HOME/bin/spark-submit src/test/python/matrix_sum_example.py"
-runCommand "$SPARK_HOME/bin/spark-submit target/release/incubator-systemml/src/main/python/tests/test_matrix_agg_fn.py"
-runCommand "$SPARK_HOME/bin/spark-submit target/release/incubator-systemml/src/main/python/tests/test_matrix_binary_op.py"
-runCommand "$SPARK_HOME/bin/spark-submit target/release/incubator-systemml/src/main/python/tests/test_mlcontext.py"
-runCommand "$SPARK_HOME/bin/spark-submit target/release/incubator-systemml/src/main/python/tests/test_mllearn_df.py"
-runCommand "$SPARK_HOME/bin/spark-submit target/release/incubator-systemml/src/main/python/tests/test_mllearn_numpy.py"
+runCommand "$SPARK_HOME/bin/spark-submit target/release/systemml/src/main/python/tests/test_matrix_agg_fn.py"
+runCommand "$SPARK_HOME/bin/spark-submit target/release/systemml/src/main/python/tests/test_matrix_binary_op.py"
+runCommand "$SPARK_HOME/bin/spark-submit target/release/systemml/src/main/python/tests/test_mlcontext.py"
+runCommand "$SPARK_HOME/bin/spark-submit target/release/systemml/src/main/python/tests/test_mllearn_df.py"
+runCommand "$SPARK_HOME/bin/spark-submit target/release/systemml/src/main/python/tests/test_mllearn_numpy.py"
# Specifying python2 to be used
-runCommand "PYSPARK_PYTHON=python2 spark-submit --master local[*] target/release/incubator-systemml/src/main/python/tests/test_mlcontext.py"
+runCommand "PYSPARK_PYTHON=python2 spark-submit --master local[*] target/release/systemml/src/main/python/tests/test_mlcontext.py"
# Specifying python3 to be used
-runCommand "PYSPARK_PYTHON=python3 spark-submit --master local[*] target/release/incubator-systemml/src/main/python/tests/test_mlcontext.py"
+runCommand "PYSPARK_PYTHON=python3 spark-submit --master local[*] target/release/systemml/src/main/python/tests/test_mlcontext.py"
echo "`date +%Y-%m-%dT%H:%M:%S`: INFO: Verification of binary files completed successfully."
# echo "================================================================================"
http://git-wip-us.apache.org/repos/asf/systemml/blob/486f2e18/dev/release/src/test/java/org/apache/sysml/validation/ValidateLicAndNotice.java
----------------------------------------------------------------------
diff --git a/dev/release/src/test/java/org/apache/sysml/validation/ValidateLicAndNotice.java b/dev/release/src/test/java/org/apache/sysml/validation/ValidateLicAndNotice.java
index 21099d3..230cdbb 100644
--- a/dev/release/src/test/java/org/apache/sysml/validation/ValidateLicAndNotice.java
+++ b/dev/release/src/test/java/org/apache/sysml/validation/ValidateLicAndNotice.java
@@ -55,7 +55,7 @@ public class ValidateLicAndNotice
public static String[] fileTypes = {Constants.JAR, Constants.DLL, Constants.EXP, Constants.LIB, Constants.PDB, Constants.EXE};
// Zip Distribution directory.
- private String strDistroDir = "../../../target/release/incubator-systemml/target/";
+ private String strDistroDir = "../../../target/release/systemml/target/";
static final String[][] packageLicenses =
{ {"org/antlr", "ANTLR 4 Runtime (http://www.antlr.org/antlr4-runtime) org.antlr:antlr4-runtime:4.5.3"},