Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support space in workspace #267

Merged
merged 5 commits into from
Jun 1, 2021
Merged

support space in workspace #267

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6e21e6
support space in workspace
jolorunyomi Apr 14, 2021
dd8c170
Apply suggestions from code review
jolorunyomi Apr 14, 2021
8e27f5b
Update ci/docs/build.sh
jolorunyomi May 31, 2021
8118bd1
Update ci/docs/build.sh
jolorunyomi May 31, 2021
857ffd4
Update ci/docs/build.sh
jolorunyomi May 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/cpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export PATH=/opt/conda/bin:/usr/local/cuda/bin:$PATH
export PARALLEL_LEVEL=${PARALLEL_LEVEL:-4}

# Set home to the job's workspace
export HOME=$WORKSPACE
export HOME="$WORKSPACE"

# Determine CUDA release version
export CUDA_REL=${CUDA_VERSION%.*}
Expand All @@ -25,7 +25,7 @@ export GPUCI_CONDA_RETRY_MAX=1
export GPUCI_CONDA_RETRY_SLEEP=30

# Switch to project root; also root of repo checkout
cd $WORKSPACE
cd "$WORKSPACE"

# If nightly build, append current YYMMDD to version
if [[ "$BUILD_MODE" = "branch" && "$SOURCE_BRANCH" = branch-* ]] ; then
Expand Down
10 changes: 5 additions & 5 deletions ci/docs/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ if [ -z "$PROJECT_WORKSPACE" ]; then
exit 1
fi

export DOCS_WORKSPACE=$WORKSPACE/docs
export DOCS_WORKSPACE="$WORKSPACE/docs"
export PATH=/opt/conda/bin:/usr/local/cuda/bin:$PATH
export HOME=$WORKSPACE
export HOME="$WORKSPACE"
export PROJECT_WORKSPACE=/rapids/cuxfilter
export LIBCUDF_KERNEL_CACHE_PATH="$HOME/.jitify-cache"
export NIGHTLY_VERSION=$(echo $BRANCH_VERSION | awk -F. '{print $2}')
Expand Down Expand Up @@ -43,13 +43,13 @@ cd $PROJECT_WORKSPACE/docs
make html

#Commit to Website
cd $DOCS_WORKSPACE
cd "$DOCS_WORKSPACE"

for PROJECT in ${PROJECTS[@]}; do
if [ ! -d "api/$PROJECT/$BRANCH_VERSION" ]; then
mkdir -p api/$PROJECT/$BRANCH_VERSION
fi
rm -rf $DOCS_WORKSPACE/api/$PROJECT/$BRANCH_VERSION/*
rm -rf "$DOCS_WORKSPACE/api/$PROJECT/$BRANCH_VERSION/*
jolorunyomi marked this conversation as resolved.
Show resolved Hide resolved
done

mv $PROJECT_WORKSPACE/docs/_build/html/* $DOCS_WORKSPACE/api/cuxfilter/$BRANCH_VERSION
mv $PROJECT_WORKSPACE/docs/_build/html/* "$DOCS_WORKSPACE/api/cuxfilter/$BRANCH_VERSION
jolorunyomi marked this conversation as resolved.
Show resolved Hide resolved
jolorunyomi marked this conversation as resolved.
Show resolved Hide resolved
14 changes: 7 additions & 7 deletions ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ export PARALLEL_LEVEL=${PARALLEL_LEVEL:-4}
export CUDA_REL=${CUDA_VERSION%.*}

# Set home to the job's workspace
export HOME=$WORKSPACE
export HOME="$WORKSPACE"

# Parse git describe
cd $WORKSPACE
cd "$WORKSPACE"
export GIT_DESCRIBE_TAG=`git describe --tags`
export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'`
# Set `LIBCUDF_KERNEL_CACHE_PATH` environment variable to $HOME/.jitify-cache because
Expand Down Expand Up @@ -79,7 +79,7 @@ conda list --show-channel-urls
################################################################################

gpuci_logger "Build cuxfilter"
$WORKSPACE/build.sh clean cuxfilter
"$WORKSPACE/build.sh" clean cuxfilter

################################################################################
# TEST - Run pytest
Expand All @@ -95,12 +95,12 @@ else
gpuci_logger "Check GPU usage"
nvidia-smi

cd $WORKSPACE/python/cuxfilter/tests
cd "$WORKSPACE/python/cuxfilter/tests"
gpuci_logger "Python py.test for cuxfilter"
py.test --cache-clear --junitxml=${WORKSPACE}/junit-cuxfilter.xml -v
py.test --cache-clear --junitxml="$WORKSPACE/junit-cuxfilter.xml" -v

${WORKSPACE}/ci/gpu/test-notebooks.sh 2>&1 | tee nbtest.log
python ${WORKSPACE}/ci/utils/nbtestlog2junitxml.py nbtest.log
"$WORKSPACE/ci/gpu/test-notebooks.sh" 2>&1 | tee nbtest.log
python "$WORKSPACE/ci/utils/nbtestlog2junitxml.py" nbtest.log
fi

return ${EXITCODE}
6 changes: 3 additions & 3 deletions ci/gpu/test-notebooks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash

NOTEBOOKS_DIR=${WORKSPACE}/notebooks
NBTEST=${WORKSPACE}/ci/utils/nbtest.sh
LIBCUDF_KERNEL_CACHE_PATH=${WORKSPACE}/.jitcache
NOTEBOOKS_DIR="$WORKSPACE/notebooks"
NBTEST="$WORKSPACE/ci/utils/nbtest.sh"
LIBCUDF_KERNEL_CACHE_PATH="$WORKSPACE/.jitcache"

# Add notebooks that should be skipped here
# (space-separated list of filenames without paths)
Expand Down
2 changes: 1 addition & 1 deletion ci/local/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ set -e
WORKSPACE=${REPO_PATH_IN_CONTAINER}
PREBUILD_SCRIPT=${REPO_PATH_IN_CONTAINER}/ci/gpu/prebuild.sh
BUILD_SCRIPT=${REPO_PATH_IN_CONTAINER}/ci/gpu/build.sh
cd \${WORKSPACE}
cd "\$WORKSPACE"
if [ -f \${PREBUILD_SCRIPT} ]; then
source \${PREBUILD_SCRIPT}
fi
Expand Down
2 changes: 1 addition & 1 deletion ci/utils/nbtest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ get_ipython().run_cell_magic=my_run_cell_magic

NO_COLORS=--colors=NoColor
EXITCODE=0
NBTMPDIR=${WORKSPACE}/tmp
NBTMPDIR="$WORKSPACE/tmp"
mkdir -p ${NBTMPDIR}

for nb in $*; do
Expand Down