You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@madlib.apache.org by nk...@apache.org on 2021/02/10 00:39:58 UTC
[madlib] branch master updated (a0f711c -> 620efc7)
This is an automated email from the ASF dual-hosted git repository.
nkak pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/madlib.git.
from a0f711c DL: Cleanup fit and fit_multiple
new d1b7f5c Update copyright date
new 177344b Update header to include the license
new 620efc7 Jenkins: Remove references to $reponame
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
NOTICE | 2 +-
.../test/madlib_keras_fit_multiple.sql_in | 21 +++++++++++++++++++++
src/ports/postgres/modules/utilities/debug.py_in | 19 +++++++++++++++++++
tool/jenkins/jenkins_build.sh | 12 ++++++------
tool/jenkins/rat_check.sh | 10 +++++-----
5 files changed, 52 insertions(+), 12 deletions(-)
[madlib] 01/03: Update copyright date
Posted by nk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nkak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/madlib.git
commit d1b7f5c6bd282cc6508e5c3bcd26b79d5633a8fe
Author: Nikhil Kak <nk...@vmware.com>
AuthorDate: Tue Feb 9 16:32:19 2021 -0800
Update copyright date
JIRA: MADLIB-1466
The rat check test failed because our copyright year was not updated.
Co-authored-by: Ekta Khanna <ek...@vmware.com>
---
NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/NOTICE b/NOTICE
index 10b9387..b59ed0f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache MADlib
-Copyright 2016-2020 The Apache Software Foundation.
+Copyright 2016-2021 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[madlib] 02/03: Update header to include the license
Posted by nk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nkak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/madlib.git
commit 177344bc3d05cd25c110e1dc3193f2a39dc57583
Author: Nikhil Kak <nk...@vmware.com>
AuthorDate: Tue Feb 9 16:32:25 2021 -0800
Update header to include the license
JIRA: MADLIB-1466
The rat check test discovered that we missed adding the license notice
to a couple of our deep learning files.
Co-authored-by: Ekta Khanna <ek...@vmware.com>
---
.../test/madlib_keras_fit_multiple.sql_in | 21 +++++++++++++++++++++
src/ports/postgres/modules/utilities/debug.py_in | 19 +++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/src/ports/postgres/modules/deep_learning/test/madlib_keras_fit_multiple.sql_in b/src/ports/postgres/modules/deep_learning/test/madlib_keras_fit_multiple.sql_in
index 9d113b1..2a815ba 100644
--- a/src/ports/postgres/modules/deep_learning/test/madlib_keras_fit_multiple.sql_in
+++ b/src/ports/postgres/modules/deep_learning/test/madlib_keras_fit_multiple.sql_in
@@ -1,3 +1,24 @@
+/* ---------------------------------------------------------------------*//**
+ *
+ * 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.
+ *
+ *//* ---------------------------------------------------------------------*/
+
m4_include(`SQLCommon.m4')
m4_changequote(<<<,>>>)
m4_ifdef(<<<__POSTGRESQL__>>>, -- Skip all fit multiple tests for postgres
diff --git a/src/ports/postgres/modules/utilities/debug.py_in b/src/ports/postgres/modules/utilities/debug.py_in
index 5e288be..05fc880 100644
--- a/src/ports/postgres/modules/utilities/debug.py_in
+++ b/src/ports/postgres/modules/utilities/debug.py_in
@@ -1,3 +1,22 @@
+# coding=utf-8
+#
+# 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.
+
import plpy as plpy_orig
import time
from deep_learning.madlib_keras_model_selection import ModelSelectionSchema
[madlib] 03/03: Jenkins: Remove references to $reponame
Posted by nk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nkak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/madlib.git
commit 620efc7b18dd73c68293cccb4e7e3106b5a42a89
Author: Nikhil Kak <nk...@vmware.com>
AuthorDate: Tue Feb 9 16:32:28 2021 -0800
Jenkins: Remove references to $reponame
JIRA: MADLIB-1466
With the new build job on cloudbees
https://ci-builds.apache.org/job/Madlib/, we don't need to use the
$reponame variable to access the current working directory. So this
commit removes all the references to $reponame in jenkins build script.
Also added `-j $nproc` to the `make` command to speed up the build process.
Co-authored-by: Ekta Khanna <ek...@vmware.com>
---
tool/jenkins/jenkins_build.sh | 12 ++++++------
tool/jenkins/rat_check.sh | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/tool/jenkins/jenkins_build.sh b/tool/jenkins/jenkins_build.sh
index 3b26ac9..ab003e1 100755
--- a/tool/jenkins/jenkins_build.sh
+++ b/tool/jenkins/jenkins_build.sh
@@ -50,9 +50,9 @@ docker pull madlib/postgres_10:jenkins
# Launch docker container with volume mounted from workdir
echo "-------------------------------"
cat <<EOF
-docker run -d -e POSTGRES_PASSWORD=postgres --name madlib -v "${workdir}/${reponame}":/madlib madlib/postgres_10:jenkins | tee logs/docker_setup.log
+docker run -d -e POSTGRES_PASSWORD=postgres --name madlib -v "${workdir}":/madlib madlib/postgres_10:jenkins | tee logs/docker_setup.log
EOF
-docker run -d -e POSTGRES_PASSWORD=postgres --name madlib -v "${workdir}/${reponame}":/madlib madlib/postgres_10:jenkins | tee logs/docker_setup.log
+docker run -d -e POSTGRES_PASSWORD=postgres --name madlib -v "${workdir}":/madlib madlib/postgres_10:jenkins | tee logs/docker_setup.log
echo "-------------------------------"
## This sleep is required since it takes a couple of seconds for the docker
@@ -69,9 +69,9 @@ docker exec madlib bash -c 'apt-get update; apt-get install -y python-pip; pip i
echo "---------- Building package -----------"
# cmake, make, make install, and make package
cat <<EOF
-docker exec madlib bash -c 'rm -rf /build; mkdir /build; cd /build; cmake ../madlib; make clean; make; make install; make package' | tee $workdir/logs/madlib_compile.log
+docker exec madlib bash -c 'rm -rf /build; mkdir /build; cd /build; cmake ../madlib; make clean; make -j$(nproc); make -j$(nproc); make install; make package' | tee $workdir/logs/madlib_compile.log
EOF
-docker exec madlib bash -c 'rm -rf /build; mkdir /build; cd /build; cmake ../madlib; make clean; make; make install; make package' | tee $workdir/logs/madlib_compile.log
+docker exec madlib bash -c 'rm -rf /build; mkdir /build; cd /build; cmake ../madlib; make clean; make -j$(nproc); make -j$(nproc); make install; make package' | tee $workdir/logs/madlib_compile.log
echo "---------- Installing and running dev-check --------------------"
# Install MADlib and run dev check
@@ -108,6 +108,6 @@ echo "-------------------------------"
# convert dev-check test results to junit format for reporting
cat <<EOF
-python ${reponame}/tool/jenkins/junit_export.py $workdir/logs/madlib_dev_check.log $workdir/logs/madlib_dev_check.xml
+python tool/jenkins/junit_export.py $workdir/logs/madlib_dev_check.log $workdir/logs/madlib_dev_check.xml
EOF
-python ${reponame}/tool/jenkins/junit_export.py $workdir $workdir/logs/madlib_dev_check.log $workdir/logs/madlib_dev_check.xml
+python tool/jenkins/junit_export.py $workdir $workdir/logs/madlib_dev_check.log $workdir/logs/madlib_dev_check.xml
diff --git a/tool/jenkins/rat_check.sh b/tool/jenkins/rat_check.sh
index ae30212..32b4a8d 100644
--- a/tool/jenkins/rat_check.sh
+++ b/tool/jenkins/rat_check.sh
@@ -25,13 +25,13 @@ workdir=`pwd`
reponame=${REPONAME:=madlib}
# Check if NOTICE file year is current
-grep "Copyright 2016-$(date +"%Y") The Apache Software Foundation" "${workdir}/${reponame}/NOTICE"
+grep "Copyright 2016-$(date +"%Y") The Apache Software Foundation" "${workdir}/NOTICE"
# Check if pom.xml file version is current
# With below grep, it's possible to get a "False Positive" (i.e. no error when it should have)
# but won't give a "False Negative" (i.e. if it fails then there's definitely a problem)
-grep "<version>$(cat "${workdir}/${reponame}/src/config/Version.yml" | cut -d" " -f2)</version>" \
- "${workdir}/${reponame}/pom.xml"
+grep "<version>$(cat "${workdir}/src/config/Version.yml" | cut -d" " -f2)</version>" \
+ "${workdir}/pom.xml"
set +x
@@ -40,7 +40,7 @@ badfiles_found=false
for extension in ${badfile_extentions}; do
echo "Searching for ${extension} files:"
- badfile_count=$(find . -name "${workdir}/${reponame}/*.${extension}" | wc -l)
+ badfile_count=$(find . -name "${workdir}/*.${extension}" | wc -l)
if [ ${badfile_count} != 0 ]; then
echo "----------------------------------------------------------------------"
echo "FATAL: ${extension} files should not exist"
@@ -48,7 +48,7 @@ for extension in ${badfile_extentions}; do
echo "binary (jar) files as users have a hard time verifying their"
echo "contents."
- find . -name "${workdir}/${reponame}/*.${extension}"
+ find . -name "${workdir}/*.${extension}"
echo "----------------------------------------------------------------------"
badfiles_found=true
else