From 13313c293eb00d2eb88edcaf68386fdf52152aeb Mon Sep 17 00:00:00 2001 From: auphelia Date: Fri, 6 Oct 2023 17:21:45 +0100 Subject: [PATCH] [CI/docs] hotfix for Jenkins and docs to not use setup.py --- docker/jenkins/Jenkinsfile | 10 +++++----- docs/finn/developers.rst | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/jenkins/Jenkinsfile b/docker/jenkins/Jenkinsfile index 2954877c2a..6be8845ab7 100644 --- a/docker/jenkins/Jenkinsfile +++ b/docker/jenkins/Jenkinsfile @@ -14,31 +14,31 @@ node { parallel firstBranch: { stage('Brevitas export') { dir("${env.WORKSPACE}") { - sh("bash run-docker.sh python setup.py test --addopts -mbrevitas_export") + sh("bash run-docker.sh pytest -mbrevitas_export") } } }, secondBranch: { stage('Streamlining transformations') { dir("${env.WORKSPACE}") { - sh("bash run-docker.sh python setup.py test --addopts -mstreamline") + sh("bash run-docker.sh pytest -mstreamline") } } }, thirdBranch: { stage('Util functions') { dir("${env.WORKSPACE}") { - sh("bash run-docker.sh python setup.py test --addopts -mutil") + sh("bash run-docker.sh pytest -mutil") } } }, fourthBranch: { stage('General transformations') { dir("${env.WORKSPACE}") { - sh("bash run-docker.sh python setup.py test --addopts -mtransform") + sh("bash run-docker.sh pytest -mtransform") } } }, fifthBranch: { stage('Fpgadataflow transformations and simulations') { dir("${env.WORKSPACE}") { - sh("bash run-docker.sh python setup.py test --addopts -mfpgadataflow") + sh("bash run-docker.sh pytest -mfpgadataflow") } } } diff --git a/docs/finn/developers.rst b/docs/finn/developers.rst index f9252f764c..1e1c48e2b5 100644 --- a/docs/finn/developers.rst +++ b/docs/finn/developers.rst @@ -159,8 +159,8 @@ from the FINN root directory as follows: If you want to run tests in parallel (e.g. to take advantage of a multi-core CPU) you can use: -* pytest-parallel for any rtlsim tests, e.g. `python setup.py test --addopts "-k rtlsim --workers auto"` -* pytest-xdist for anything else, make sure to add `--dist=loadfile` if you have tests in the same file that have dependencies on each other e.g. `python setup.py test --addopts "-k mytest -n auto --dist=loadfile"` +* pytest-parallel for any rtlsim tests, e.g. `pytest -k rtlsim --workers auto` +* pytest-xdist for anything else, make sure to add `--dist=loadfile` if you have tests in the same file that have dependencies on each other e.g. `pytest -k mytest -n auto --dist=loadfile` Finally, the full test suite with appropriate parallelization can be run inside the container by: