Skip to content

Commit

Permalink
support space in workspace (rapidsai#349)
Browse files Browse the repository at this point in the history
# Summary
Support spaces in workspace

Authors:
  - Joseph (https://github.com/jolorunyomi)
  - Ray Douglass (https://github.com/raydouglass)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)

URL: rapidsai#349
  • Loading branch information
jolorunyomi authored Aug 18, 2021
1 parent fdc4ad6 commit 81cdf44
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 25 deletions.
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,20 @@ Please see https://github.com/rapidsai/cusignal/releases/tag/v21.10.00a for the

# cuSignal 21.08.00 (Date TBD)

Please see https://github.com/rapidsai/cusignal/releases/tag/v21.08.00a for the latest changes to this development branch.
## 🐛 Bug Fixes

- Remove pytorch from cusignal CI/CD ([#404](https://github.com/rapidsai/cusignal/pull/404)) [@awthomp](https://github.com/awthomp)
- fix firwin bug where fs is ignored if nyq provided ([#400](https://github.com/rapidsai/cusignal/pull/400)) [@awthomp](https://github.com/awthomp)
- Fixed imaginary part being removed in delay mode of ambgfun ([#397](https://github.com/rapidsai/cusignal/pull/397)) [@cliffburdick](https://github.com/cliffburdick)

## 🛠️ Improvements

- mvdr perf optimizations and addition of elementwise divide kernel ([#403](https://github.com/rapidsai/cusignal/pull/403)) [@awthomp](https://github.com/awthomp)
- Update sphinx config ([#395](https://github.com/rapidsai/cusignal/pull/395)) [@ajschmidt8](https://github.com/ajschmidt8)
- Add Ambiguity Function (ambgfun) ([#393](https://github.com/rapidsai/cusignal/pull/393)) [@awthomp](https://github.com/awthomp)
- Fix `21.08` forward-merge conflicts ([#392](https://github.com/rapidsai/cusignal/pull/392)) [@ajschmidt8](https://github.com/ajschmidt8)
- Adding MVDR (Capon) Beamformer ([#383](https://github.com/rapidsai/cusignal/pull/383)) [@awthomp](https://github.com/awthomp)
- Fix merge conflicts ([#379](https://github.com/rapidsai/cusignal/pull/379)) [@ajschmidt8](https://github.com/ajschmidt8)

# cuSignal 21.06.00 (9 Jun 2021)

Expand Down
8 changes: 4 additions & 4 deletions ci/benchmark/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ if [ ! -z "$JENKINS_HOME" ] ; then
fi

# Set path, build parallel level, and CUDA version
cd $WORKSPACE
cd "$WORKSPACE"
export PATH=/opt/conda/bin:/usr/local/cuda/bin:$PATH
export PARALLEL_LEVEL=${PARALLEL_LEVEL:-4}
export CUDA_REL=${CUDA_VERSION%.*}

# Set home
export HOME=$WORKSPACE
export HOME="$WORKSPACE"

# Parse git describe
export GIT_DESCRIBE_TAG=`git describe --tags`
Expand All @@ -38,7 +38,7 @@ export GPUCI_CONDA_RETRY_MAX=1
export GPUCI_CONDA_RETRY_SLEEP=30

# Set Benchmark Vars
export BENCHMARKS_DIR=${WORKSPACE}/benchmarks
export BENCHMARKS_DIR="$WORKSPACE/benchmarks"

##########################################
# Environment Setup #
Expand Down Expand Up @@ -77,7 +77,7 @@ conda list --show-channel-urls
##########################################

gpuci_logger "Build cuSignal"
$WORKSPACE/build.sh
"$WORKSPACE/build.sh"

##########################################
# Run Benchmarks #
Expand Down
2 changes: 1 addition & 1 deletion ci/checks/style.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PATH=/opt/conda/bin:$PATH
. /opt/conda/etc/profile.d/conda.sh
conda activate rapids

cd $WORKSPACE/python
cd "$WORKSPACE/python"

# Run flake8 and get results/return code
FLAKE=`flake8`
Expand Down
4 changes: 2 additions & 2 deletions ci/cpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ 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"

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

# Setup 'gpuci_conda_retry' for build retries (results in 2 total attempts)
export GPUCI_CONDA_RETRY_MAX=1
Expand Down
12 changes: 6 additions & 6 deletions ci/docs/build.sh
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/cusignal
export LIBCUDF_KERNEL_CACHE_PATH="$HOME/.jitify-cache"
export PROJECTS=(cusignal)
Expand All @@ -39,17 +39,17 @@ conda list --show-channel-urls

# Build Python docs
gpuci_logger "Build Sphinx docs"
cd $PROJECT_WORKSPACE/docs
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/*
done

mv $PROJECT_WORKSPACE/docs/build/html/* $DOCS_WORKSPACE/api/cusignal/$BRANCH_VERSION
mv "$PROJECT_WORKSPACE/docs/build/html/"* "$DOCS_WORKSPACE/api/cusignal/"$BRANCH_VERSION
12 changes: 6 additions & 6 deletions ci/gpu/build.sh
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 describei
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]+)'`

Expand Down Expand Up @@ -62,7 +62,7 @@ conda list --show-channel-urls
################################################################################

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

################################################################################
# TEST - Run GoogleTest and py.tests for cusignal
Expand All @@ -81,11 +81,11 @@ gpuci_logger "Check GPU usage"
nvidia-smi

gpuci_logger "Python pytest for cusignal"
cd $WORKSPACE/python
cd "$WORKSPACE/python"

pytest --cache-clear --junitxml=${WORKSPACE}/junit-cusignal.xml -v -s -m "not cpu"
pytest --cache-clear --junitxml="$WORKSPACE/junit-cusignal.xml" -v -s -m "not cpu"

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

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

#RAPIDS_DIR=/rapids
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
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
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

0 comments on commit 81cdf44

Please sign in to comment.