Repository: incubator-hivemall Updated Branches: refs/heads/v0.5.0 2c30886ed -> b0f3ac1a3
Fixed scripts and pom Project: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/commit/b0f3ac1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/tree/b0f3ac1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/diff/b0f3ac1a Branch: refs/heads/v0.5.0 Commit: b0f3ac1a3f095827eb438c93619a1095b405aadf Parents: 2c30886 Author: Makoto Yui <[email protected]> Authored: Thu Jan 25 08:49:54 2018 +0900 Committer: Makoto Yui <[email protected]> Committed: Thu Jan 25 08:49:54 2018 +0900 ---------------------------------------------------------------------- bin/build.sh | 1 - bin/build_xgboost.sh | 104 -------------------------------------- bin/maven_central_release.sh | 33 ------------ bin/set_version.sh | 2 - pom.xml | 4 +- 5 files changed, 2 insertions(+), 142 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/b0f3ac1a/bin/build.sh ---------------------------------------------------------------------- diff --git a/bin/build.sh b/bin/build.sh index 8487d70..05d1f8f 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -30,5 +30,4 @@ if [ "$HIVEMALL_HOME" = "" ]; then fi cd $HIVEMALL_HOME -mvn validate -Pxgboost mvn clean package -Dskiptests=true -Dmaven.test.skip=true http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/b0f3ac1a/bin/build_xgboost.sh ---------------------------------------------------------------------- diff --git a/bin/build_xgboost.sh b/bin/build_xgboost.sh deleted file mode 100755 index 8aa7abe..0000000 --- a/bin/build_xgboost.sh +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# xgboost requires g++-4.6 or higher (https://github.com/dmlc/xgboost/blob/master/doc/build.md), -# so we need to first check if the requirement is satisfied. -# g++-4.7 or higher is required when building on Ubuntu 14.04 on Docker. -COMPILER_REQUIRED_VERSION=4.7 - -# See simple version normalization: http://stackoverflow.com/questions/16989598/bash-comparing-version-numbers -function compiler_version { echo "$@" | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }'; } - -arch=$(uname -s) -if [ $arch = 'Darwin' ]; then - if [ -z $CXX ]; then - if type "g++-5" > /dev/null 2>&1; then - export CXX=`which g++-5` - elif type "g++-6" > /dev/null 2>&1; then - export CXX=`which gcc-6` - else - echo 'export CXX=`which g++-X`; is required.' - echo 'Run `brew install g++-5; export CXX=g++-5;`' - exit 1 - fi - fi -else - # linux defaults - if [ -z $CXX ]; then - if type "g++" > /dev/null 2>&1; then - export CXX=`which g++` - COMPILER_VERSION_NUMBER=`${CXX} --version 2> /dev/null | grep ^g++ | \ - awk 'match($0, /[0-9]+\.[0-9]+\.[0-9]+/) {print substr($0, RSTART, RLENGTH)}'` - if [ $(compiler_version $COMPILER_VERSION_NUMBER) -lt $COMPILER_REQUIRED_VERSION ]; then - echo "You must compile xgboost with GNU g++-$COMPILER_REQUIRED_VERSION or higher," \ - "but the detected compiler was g++-$COMPILER_VERSION_NUMBER" - exit 1 - fi - else - echo 'g++ does not find. export CXX=`which g++-X`; is required.' - exit 1 - fi - fi -fi - -# Move to a top directory -if [ "$HIVEMALL_HOME" = "" ]; then - if [ -e ../bin/${0##*/} ]; then - HIVEMALL_HOME=`pwd`/.. - elif [ -e ./bin/${0##*/} ]; then - HIVEMALL_HOME=`pwd` - else - echo "env HIVEMALL_HOME not defined" - exit 1 - fi -fi - -cd $HIVEMALL_HOME - -# Final output dir for a custom-compiled xgboost binary -HIVEMALL_LIB_DIR="$HIVEMALL_HOME/xgboost/src/main/resources/lib/" -rm -rf $HIVEMALL_LIB_DIR >> /dev/null -mkdir -p $HIVEMALL_LIB_DIR - -# Target commit hash value -XGBOOST_HASHVAL='2471e70f2436fbb6a76a0ca0121b96c07d994c4a' - -# Move to an output directory -XGBOOST_OUT="$HIVEMALL_HOME/target/xgboost-$XGBOOST_HASHVAL" -rm -rf $XGBOOST_OUT >> /dev/null -mkdir -p $XGBOOST_OUT -cd $XGBOOST_OUT - -# Fetch xgboost sources -git clone --progress \ - --depth 5 --branch xgboost_v0.60_with_portable_binaries --single-branch \ - https://github.com/myui/xgboost.git -cd xgboost -git checkout $XGBOOST_HASHVAL - -# Resolve dependent sources -git submodule init -git submodule update - -# Copy a built binary to the output -cd jvm-packages -ENABLE_STATIC_LINKS=1 CC=${CC} CXX=${CXX} ./create_jni.sh -cp ./lib/libxgboost4j.* "$HIVEMALL_LIB_DIR" - http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/b0f3ac1a/bin/maven_central_release.sh ---------------------------------------------------------------------- diff --git a/bin/maven_central_release.sh b/bin/maven_central_release.sh deleted file mode 100755 index 8a7918f..0000000 --- a/bin/maven_central_release.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -if [ "$HIVEMALL_HOME" = "" ]; then - if [ -e ../bin/${0##*/} ]; then - HIVEMALL_HOME=".." - elif [ -e ./bin/${0##*/} ]; then - HIVEMALL_HOME="." - else - echo "env HIVEMALL_HOME not defined" - exit 1 - fi -fi - -cd $HIVEMALL_HOME -mvn clean deploy -DperformRelease=true -Dskiptests=true -Dmaven.test.skip=true http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/b0f3ac1a/bin/set_version.sh ---------------------------------------------------------------------- diff --git a/bin/set_version.sh b/bin/set_version.sh index 7d5c9ff..ce9e576 100755 --- a/bin/set_version.sh +++ b/bin/set_version.sh @@ -109,7 +109,6 @@ if [ $update_pom -eq 0 ]; then find . -type f \( -name 'VERSION' -o -name 'pom.xml' -o -name 'HivemallConstants.java' -o -name 'HivemallOpsSuite.scala' -o -name 'HiveUdfSuite.scala' \) | xargs grep ${old_version} else find . -type f \( -name 'VERSION' -o -name 'HivemallConstants.java' -o -name 'HivemallOpsSuite.scala' -o -name 'HiveUdfSuite.scala' \) | xargs grep ${old_version} - find ./spark -type f \( -name 'pom.xml' \) | xargs grep ${old_version} fi echo "--------------------------------------------------------------------------" echo @@ -128,7 +127,6 @@ if [ $update_pom -eq 0 ]; then find . -type f \( -name 'VERSION' -o -name 'pom.xml' -o -name 'HivemallConstants.java' -o -name 'HivemallOpsSuite.scala' -o -name 'HiveUdfSuite.scala' \) | xargs sed -i '' -e "s/${old_version}/${new_version}/g" else find . -type f \( -name 'VERSION' -o -name 'HivemallConstants.java' -o -name 'HivemallOpsSuite.scala' -o -name 'HiveUdfSuite.scala' \) | xargs sed -i '' -e "s/${old_version}/${new_version}/g" - find ./spark -type f \( -name 'pom.xml' \) | xargs sed -i '' -e "s/${old_version}/${new_version}/g" fi echo "Done!" http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/b0f3ac1a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7a30c8b..2bc9eae 100644 --- a/pom.xml +++ b/pom.xml @@ -152,8 +152,8 @@ <name>Tsuyoshi Ozawa</name> <email>ozawa[at]apache.org</email> <url>https://people.apache.org/~ozawa/</url> - <organization>Nippon Telegraph and Telephone Corporation (NTT)</organization> - <organizationUrl>http://www.ntt.co.jp/</organizationUrl> + <organization/> + <organizationUrl/> <roles> <role>PPMC Member</role> </roles>
