From a60353046066064f0ba45b55b4be2dd4916914d4 Mon Sep 17 00:00:00 2001 From: Amit Raj Date: Fri, 9 May 2025 05:59:10 +0000 Subject: [PATCH 1/2] Updated VllM test to catch the error and CI should still continue after the failure if this stage Signed-off-by: Amit Raj --- scripts/Jenkinsfile | 154 ++++++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/scripts/Jenkinsfile b/scripts/Jenkinsfile index 7036d6f6d..711c123db 100644 --- a/scripts/Jenkinsfile +++ b/scripts/Jenkinsfile @@ -30,89 +30,89 @@ pipeline { } } - stage('Non CLI Tests') { - parallel { - stage('Run Non-CLI Non-QAIC Tests') { - steps { - timeout(time: 25, unit: 'MINUTES') { - sh ''' - sudo docker exec ${BUILD_TAG} bash -c " - cd /efficient-transformers && - . preflight_qeff/bin/activate && - mkdir -p $PWD/Non_cli_qaic && - export TOKENIZERS_PARALLELISM=false && - export QEFF_HOME=$PWD/Non_cli_qaic && - pytest tests -m '(not cli) and (not on_qaic)' --ignore tests/vllm -n auto --junitxml=tests/tests_log1.xml && - junitparser merge tests/tests_log1.xml tests/tests_log.xml && - deactivate" - ''' - } - } - } - stage('Run Non-CLI QAIC Tests') { - steps { - timeout(time: 200, unit: 'MINUTES') { - sh ''' - sudo docker exec ${BUILD_TAG} bash -c " - cd /efficient-transformers && - . preflight_qeff/bin/activate && - mkdir -p $PWD/Non_qaic && - export TOKENIZERS_PARALLELISM=false && - export QEFF_HOME=$PWD/Non_qaic && - pytest tests -m '(not cli) and (on_qaic) and (not qnn)' --ignore tests/vllm -n 4 --junitxml=tests/tests_log2.xml && - junitparser merge tests/tests_log2.xml tests/tests_log.xml && - deactivate" - ''' - } - } - } - } - } - stage('QAIC MultiModal Tests') { - steps { - timeout(time: 60, unit: 'MINUTES') { - sh ''' - sudo docker exec ${BUILD_TAG} bash -c " - cd /efficient-transformers && - . preflight_qeff/bin/activate && - mkdir -p $PWD/Non_cli_qaic_multimodal && - export TOKENIZERS_PARALLELISM=false && - export QEFF_HOME=$PWD/Non_cli_qaic_multimodal && - pytest tests -m '(not cli) and (on_qaic) and (multimodal) and (not qnn)' --ignore tests/vllm -n 4 --junitxml=tests/tests_log6.xml && - junitparser merge tests/tests_log6.xml tests/tests_log.xml && - deactivate" - ''' - } - } - } - stage('CLI Tests') { - steps { - timeout(time: 60, unit: 'MINUTES') { - sh ''' - sudo docker exec ${BUILD_TAG} bash -c " - source /qnn_sdk/bin/envsetup.sh && - source /qnn_sdk/bin/envcheck -c && - cd /efficient-transformers && - . preflight_qeff/bin/activate && - mkdir -p $PWD/cli && - export TOKENIZERS_PARALLELISM=false && - export QEFF_HOME=$PWD/cli && - pytest tests -m '(cli and not qnn)' --ignore tests/vllm --junitxml=tests/tests_log3.xml && - junitparser merge tests/tests_log3.xml tests/tests_log.xml && - deactivate" - ''' - } - } - } + // stage('Non CLI Tests') { + // parallel { + // stage('Run Non-CLI Non-QAIC Tests') { + // steps { + // timeout(time: 25, unit: 'MINUTES') { + // sh ''' + // sudo docker exec ${BUILD_TAG} bash -c " + // cd /efficient-transformers && + // . preflight_qeff/bin/activate && + // mkdir -p $PWD/Non_cli_qaic && + // export TOKENIZERS_PARALLELISM=false && + // export QEFF_HOME=$PWD/Non_cli_qaic && + // pytest tests -m '(not cli) and (not on_qaic)' --ignore tests/vllm -n auto --junitxml=tests/tests_log1.xml && + // junitparser merge tests/tests_log1.xml tests/tests_log.xml && + // deactivate" + // ''' + // } + // } + // } + // stage('Run Non-CLI QAIC Tests') { + // steps { + // timeout(time: 200, unit: 'MINUTES') { + // sh ''' + // sudo docker exec ${BUILD_TAG} bash -c " + // cd /efficient-transformers && + // . preflight_qeff/bin/activate && + // mkdir -p $PWD/Non_qaic && + // export TOKENIZERS_PARALLELISM=false && + // export QEFF_HOME=$PWD/Non_qaic && + // pytest tests -m '(not cli) and (on_qaic) and (not qnn)' --ignore tests/vllm -n 4 --junitxml=tests/tests_log2.xml && + // junitparser merge tests/tests_log2.xml tests/tests_log.xml && + // deactivate" + // ''' + // } + // } + // } + // } + // } + // stage('QAIC MultiModal Tests') { + // steps { + // timeout(time: 60, unit: 'MINUTES') { + // sh ''' + // sudo docker exec ${BUILD_TAG} bash -c " + // cd /efficient-transformers && + // . preflight_qeff/bin/activate && + // mkdir -p $PWD/Non_cli_qaic_multimodal && + // export TOKENIZERS_PARALLELISM=false && + // export QEFF_HOME=$PWD/Non_cli_qaic_multimodal && + // pytest tests -m '(not cli) and (on_qaic) and (multimodal) and (not qnn)' --ignore tests/vllm -n 4 --junitxml=tests/tests_log6.xml && + // junitparser merge tests/tests_log6.xml tests/tests_log.xml && + // deactivate" + // ''' + // } + // } + // } + // stage('CLI Tests') { + // steps { + // timeout(time: 60, unit: 'MINUTES') { + // sh ''' + // sudo docker exec ${BUILD_TAG} bash -c " + // source /qnn_sdk/bin/envsetup.sh && + // source /qnn_sdk/bin/envcheck -c && + // cd /efficient-transformers && + // . preflight_qeff/bin/activate && + // mkdir -p $PWD/cli && + // export TOKENIZERS_PARALLELISM=false && + // export QEFF_HOME=$PWD/cli && + // pytest tests -m '(cli and not qnn)' --ignore tests/vllm --junitxml=tests/tests_log3.xml && + // junitparser merge tests/tests_log3.xml tests/tests_log.xml && + // deactivate" + // ''' + // } + // } + // } stage('vLLM Tests') { - - steps - { + steps { + catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { build job: 'qefficient_vllm_upstream', parameters: [string(name: 'NAME', value: "${BUILD_TAG}")], propagate: true, wait: true } + } } stage('QNN CLI Tests') { steps { From bfdc29e202b97f2b3afb8c53ac96162623af0b79 Mon Sep 17 00:00:00 2001 From: Amit Raj Date: Fri, 9 May 2025 06:17:02 +0000 Subject: [PATCH 2/2] Removed the commented code Signed-off-by: Amit Raj --- scripts/Jenkinsfile | 149 ++++++++++++++++++++++---------------------- 1 file changed, 74 insertions(+), 75 deletions(-) diff --git a/scripts/Jenkinsfile b/scripts/Jenkinsfile index 711c123db..03ae4cdb6 100644 --- a/scripts/Jenkinsfile +++ b/scripts/Jenkinsfile @@ -29,81 +29,80 @@ pipeline { ''' } } - - // stage('Non CLI Tests') { - // parallel { - // stage('Run Non-CLI Non-QAIC Tests') { - // steps { - // timeout(time: 25, unit: 'MINUTES') { - // sh ''' - // sudo docker exec ${BUILD_TAG} bash -c " - // cd /efficient-transformers && - // . preflight_qeff/bin/activate && - // mkdir -p $PWD/Non_cli_qaic && - // export TOKENIZERS_PARALLELISM=false && - // export QEFF_HOME=$PWD/Non_cli_qaic && - // pytest tests -m '(not cli) and (not on_qaic)' --ignore tests/vllm -n auto --junitxml=tests/tests_log1.xml && - // junitparser merge tests/tests_log1.xml tests/tests_log.xml && - // deactivate" - // ''' - // } - // } - // } - // stage('Run Non-CLI QAIC Tests') { - // steps { - // timeout(time: 200, unit: 'MINUTES') { - // sh ''' - // sudo docker exec ${BUILD_TAG} bash -c " - // cd /efficient-transformers && - // . preflight_qeff/bin/activate && - // mkdir -p $PWD/Non_qaic && - // export TOKENIZERS_PARALLELISM=false && - // export QEFF_HOME=$PWD/Non_qaic && - // pytest tests -m '(not cli) and (on_qaic) and (not qnn)' --ignore tests/vllm -n 4 --junitxml=tests/tests_log2.xml && - // junitparser merge tests/tests_log2.xml tests/tests_log.xml && - // deactivate" - // ''' - // } - // } - // } - // } - // } - // stage('QAIC MultiModal Tests') { - // steps { - // timeout(time: 60, unit: 'MINUTES') { - // sh ''' - // sudo docker exec ${BUILD_TAG} bash -c " - // cd /efficient-transformers && - // . preflight_qeff/bin/activate && - // mkdir -p $PWD/Non_cli_qaic_multimodal && - // export TOKENIZERS_PARALLELISM=false && - // export QEFF_HOME=$PWD/Non_cli_qaic_multimodal && - // pytest tests -m '(not cli) and (on_qaic) and (multimodal) and (not qnn)' --ignore tests/vllm -n 4 --junitxml=tests/tests_log6.xml && - // junitparser merge tests/tests_log6.xml tests/tests_log.xml && - // deactivate" - // ''' - // } - // } - // } - // stage('CLI Tests') { - // steps { - // timeout(time: 60, unit: 'MINUTES') { - // sh ''' - // sudo docker exec ${BUILD_TAG} bash -c " - // source /qnn_sdk/bin/envsetup.sh && - // source /qnn_sdk/bin/envcheck -c && - // cd /efficient-transformers && - // . preflight_qeff/bin/activate && - // mkdir -p $PWD/cli && - // export TOKENIZERS_PARALLELISM=false && - // export QEFF_HOME=$PWD/cli && - // pytest tests -m '(cli and not qnn)' --ignore tests/vllm --junitxml=tests/tests_log3.xml && - // junitparser merge tests/tests_log3.xml tests/tests_log.xml && - // deactivate" - // ''' - // } - // } - // } + stage('Non CLI Tests') { + parallel { + stage('Run Non-CLI Non-QAIC Tests') { + steps { + timeout(time: 25, unit: 'MINUTES') { + sh ''' + sudo docker exec ${BUILD_TAG} bash -c " + cd /efficient-transformers && + . preflight_qeff/bin/activate && + mkdir -p $PWD/Non_cli_qaic && + export TOKENIZERS_PARALLELISM=false && + export QEFF_HOME=$PWD/Non_cli_qaic && + pytest tests -m '(not cli) and (not on_qaic)' --ignore tests/vllm -n auto --junitxml=tests/tests_log1.xml && + junitparser merge tests/tests_log1.xml tests/tests_log.xml && + deactivate" + ''' + } + } + } + stage('Run Non-CLI QAIC Tests') { + steps { + timeout(time: 200, unit: 'MINUTES') { + sh ''' + sudo docker exec ${BUILD_TAG} bash -c " + cd /efficient-transformers && + . preflight_qeff/bin/activate && + mkdir -p $PWD/Non_qaic && + export TOKENIZERS_PARALLELISM=false && + export QEFF_HOME=$PWD/Non_qaic && + pytest tests -m '(not cli) and (on_qaic) and (not qnn)' --ignore tests/vllm -n 4 --junitxml=tests/tests_log2.xml && + junitparser merge tests/tests_log2.xml tests/tests_log.xml && + deactivate" + ''' + } + } + } + } + } + stage('QAIC MultiModal Tests') { + steps { + timeout(time: 60, unit: 'MINUTES') { + sh ''' + sudo docker exec ${BUILD_TAG} bash -c " + cd /efficient-transformers && + . preflight_qeff/bin/activate && + mkdir -p $PWD/Non_cli_qaic_multimodal && + export TOKENIZERS_PARALLELISM=false && + export QEFF_HOME=$PWD/Non_cli_qaic_multimodal && + pytest tests -m '(not cli) and (on_qaic) and (multimodal) and (not qnn)' --ignore tests/vllm -n 4 --junitxml=tests/tests_log6.xml && + junitparser merge tests/tests_log6.xml tests/tests_log.xml && + deactivate" + ''' + } + } + } + stage('CLI Tests') { + steps { + timeout(time: 60, unit: 'MINUTES') { + sh ''' + sudo docker exec ${BUILD_TAG} bash -c " + source /qnn_sdk/bin/envsetup.sh && + source /qnn_sdk/bin/envcheck -c && + cd /efficient-transformers && + . preflight_qeff/bin/activate && + mkdir -p $PWD/cli && + export TOKENIZERS_PARALLELISM=false && + export QEFF_HOME=$PWD/cli && + pytest tests -m '(cli and not qnn)' --ignore tests/vllm --junitxml=tests/tests_log3.xml && + junitparser merge tests/tests_log3.xml tests/tests_log.xml && + deactivate" + ''' + } + } + } stage('vLLM Tests') { steps { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {