diff --git a/tests/nightly/sh2ju.sh b/tests/nightly/sh2ju.sh deleted file mode 100644 index 4465cd8f843f..000000000000 --- a/tests/nightly/sh2ju.sh +++ /dev/null @@ -1,149 +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. - -### Copyright 2010 Manuel Carrasco MoƱino. (manolo at apache.org) -### -### Licensed under the Apache License, Version 2.0. -### You may obtain a copy of it at -### http://www.apache.org/licenses/LICENSE-2.0 - -### -### A library for shell scripts which creates reports in jUnit format. -### These reports can be used in Jenkins, or any other CI. -### -### Usage: -### - Include this file in your shell script -### - Use juLog to call your command any time you want to produce a new report -### Usage: juLog command arguments -### options: -### -name="TestName" : the test name which will be shown in the junit report -### -error="RegExp" : a regexp which sets the test as failure when the output matches it -### -ierror="RegExp" : same as -error but case insensitive -### - Junit reports are left in the folder 'result' under the directory where the script is executed. -### - Configure Jenkins to parse junit files from the generated folder -### - -asserts=00; errors=0; total=0; content="" -date=`which gdate || which date` - -# create output folder -juDIR=`pwd`/results -mkdir -p "$juDIR" || exit - -# The name of the suite is calculated based in your script name -suite=`basename $0 | sed -e 's/.sh$//' | tr "." "_"` - -# A wrapper for the eval method witch allows catching seg-faults and use tee -errfile=/tmp/evErr.$$.log -eVal() { - eval "$1" - echo $? | tr -d "\n" >$errfile -} - -# Method to clean old tests -juLogClean() { - echo "+++ Removing old junit reports from: $juDIR " - rm -f "$juDIR"/TEST-* -} - -# Execute a command and record its results -juLog() { - - # parse arguments - ya=""; icase="" - while [ -z "$ya" ]; do - case "$1" in - -name=*) name=$asserts-`echo "$1" | sed -e 's/-name=//'`; shift;; - -ierror=*) ereg=`echo "$1" | sed -e 's/-ierror=//'`; icase="-i"; shift;; - -error=*) ereg=`echo "$1" | sed -e 's/-error=//'`; shift;; - *) ya=1;; - esac - done - - # use first arg as name if it was not given - if [ -z "$name" ]; then - name="$asserts-$1" - shift - fi - - # calculate command to eval - [ -z "$1" ] && return - cmd="$1"; shift - while [ -n "$1" ] - do - cmd="$cmd \"$1\"" - shift - done - - # eval the command sending output to a file - outf=/var/tmp/ju$$.txt - >$outf - echo "" | tee -a $outf - echo "+++ Running case: $name " | tee -a $outf - echo "+++ working dir: "`pwd` | tee -a $outf - echo "+++ command: $cmd" | tee -a $outf - ini=`$date +%s.%N` - eVal "$cmd" 2>&1 | tee -a $outf - evErr=`cat $errfile` - rm -f $errfile - end=`date +%s.%N` - echo "+++ exit code: $evErr" | tee -a $outf - - # set the appropriate error, based in the exit code and the regex - [ $evErr != 0 ] && err=1 || err=0 - out=`cat $outf | sed -e 's/^\([^+]\)/| \1/g'` - if [ $err = 0 -a -n "$ereg" ]; then - H=`echo "$out" | egrep $icase "$ereg"` - [ -n "$H" ] && err=1 - fi - echo "+++ error: $err" | tee -a $outf - rm -f $outf - - # calculate vars - asserts=`expr $asserts + 1` - asserts=`printf "%.2d" $asserts` - errors=`expr $errors + $err` - time=`echo "$end - $ini" | bc -l` - total=`echo "$total + $time" | bc -l` - - # write the junit xml report - ## failure tag - [ $err = 0 ] && failure="" || failure=" - - " - ## testcase tag - content="$content - - $failure - - - - - " - ## testsuite block - cat < "$juDIR/TEST-$suite.xml" - - $content - -EOF - - return $evErr -} diff --git a/tests/nightly/test_all.sh b/tests/nightly/test_all.sh deleted file mode 100755 index 73f0f588fe90..000000000000 --- a/tests/nightly/test_all.sh +++ /dev/null @@ -1,128 +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. - - -# setup -export LD_LIBRARY_PATH=/usr/local/cuda/lib64:$LD_LIBRARY_PATH -cd `pwd`/`dirname $0` -. sh2ju.sh -## clean last build log -juLogClean -if [ $# -eq 1 ]; then - num_gpus=$1 -else - num_gpus=4 -fi -gpus=`seq 0 $((num_gpus-1)) | paste -sd ","` - -# build -build() { -make -C ../.. clean -make -C ../.. -j8 -return $? -} - -cp ../../make/config.mk ../.. -cat >>../../config.mk < $expected) print \"$pass\"; else print \"$fail\"}" - rm -f log -} - - -example_dir=../../example/image-classification -# python: lenet + mnist -test_lenet() { - optimizers="adam sgd adagrad" - for optimizer in ${optimizers}; do - echo "OPTIMIZER: $optimizer" - if [ "$optimizer" == "adam" ]; then - learning_rate=0.0005 - desired_accuracy=0.98 - else - learning_rate=0.01 - desired_accuracy=0.99 - fi - python $example_dir/train_mnist.py --lr $learning_rate \ - --network lenet --optimizer $optimizer --gpus $gpus \ - --num-epochs 10 2>&1 | tee log - if [ $? -ne 0 ]; then - return $? - fi - check_val $desired_accuracy - done -} -juLog -name=Python.Lenet.Mnist -error=Fail test_lenet - -# python: distributed lenet + mnist -test_dist_lenet() { - ../../tools/launch.py -n ${num_gpus} \ - python ./dist_lenet.py --data-dir `pwd`/data/mnist/ \ - --kv-store dist_sync \ - --num-epochs 10 \ - 2>&1 | tee log - check_val 0.98 -} -juLog -name=Python.Distributed.Lenet.Mnist -error=Fail test_dist_lenet - -# python: inception + cifar10 -test_inception_cifar10() { - python $example_dir/train_cifar10.py \ - --data-dir `pwd`/data/cifar10/ --gpus $gpus --num-epochs 20 --batch-size 256 \ - 2>&1 | tee log - check_val 0.82 -} -juLog -name=Python.Inception.Cifar10 -error=Fail test_inception_cifar10 - -# build without CUDNN -cat >>../../config.mk <