diff --git a/ci/jenkins/generate.py b/ci/jenkins/generate.py index 7ed3b2dc71550..8cbf12c0d600d 100644 --- a/ci/jenkins/generate.py +++ b/ci/jenkins/generate.py @@ -100,7 +100,7 @@ def change_type(lines: List[str]) -> Change: def update_jenkinsfile(source: Path) -> ChangeData: - destination = JENKINS_DIR / "generated" / source.stem + destination = GENERATED_DIR / source.stem data["generated_time"] = datetime.datetime.now().isoformat() if destination.exists(): @@ -169,7 +169,7 @@ def update_jenkinsfile(source: Path) -> ChangeData: textwrap.dedent( """ Newly generated Jenkinsfiles did not match the ones on disk! If you have made - edits to the Jenkinsfiles in genrated/, move them to the corresponding source and + edits to the Jenkinsfiles in generated/, move them to the corresponding source and regenerate the Jenkinsfiles from the templates with python3 -m pip install -r jenkins/requirements.txt diff --git a/ci/jenkins/generated/arm_jenkinsfile.groovy b/ci/jenkins/generated/arm_jenkinsfile.groovy index 2df83e0cf982f..feb74675d2c2c 100644 --- a/ci/jenkins/generated/arm_jenkinsfile.groovy +++ b/ci/jenkins/generated/arm_jenkinsfile.groovy @@ -45,7 +45,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2022-11-03T15:11:02.702503 +// Generated at 2022-11-15T12:57:47.192221 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -171,7 +171,8 @@ def docker_init(image) { if (image.contains("amazonaws.com")) { // If this string is in the image name it's from ECR and needs to be pulled // with the right credentials - ecr_pull(image) + // ecr_pull(image) + sh "echo Pulling from AWS is not implemented && exit 1" } else { sh( script: """ @@ -412,9 +413,9 @@ def fsim_test(image) { ) } -def cmake_build(image, path, make_flag) { +def cmake_build(image, path) { sh ( - script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod", + script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod --build-dir path", label: 'Run cmake build', ) } @@ -443,10 +444,10 @@ def add_hexagon_permissions() { // Run make. First try to do an incremental make from a previous workspace in hope to // accelerate the compilation. If something is wrong, clean the workspace and then // build from scratch. -def make(docker_type, path, make_flag) { +def make(docker_type, path) { timeout(time: max_time, unit: 'MINUTES') { try { - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } catch (hudson.AbortException ae) { // script exited due to user abort, directly throw instead of retry if (ae.getMessage().contains('script returned exit code 143')) { @@ -457,7 +458,7 @@ def make(docker_type, path, make_flag) { script: "${docker_run} ${docker_type} ./tests/scripts/task_clean.sh ${path}", label: 'Clear old cmake workspace', ) - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } } } @@ -478,7 +479,7 @@ def build() { script: "${docker_run} ${ci_arm} ./tests/scripts/task_config_build_arm.sh build", label: 'Create ARM cmake config', ) - make(ci_arm, 'build', '-j4') + make(ci_arm, 'build') sh( script: """ set -eux diff --git a/ci/jenkins/generated/cortexm_jenkinsfile.groovy b/ci/jenkins/generated/cortexm_jenkinsfile.groovy index 90accf05a0b4f..77447fdb71f96 100644 --- a/ci/jenkins/generated/cortexm_jenkinsfile.groovy +++ b/ci/jenkins/generated/cortexm_jenkinsfile.groovy @@ -45,7 +45,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2022-11-03T15:11:02.758239 +// Generated at 2022-11-15T12:57:47.249571 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -171,7 +171,8 @@ def docker_init(image) { if (image.contains("amazonaws.com")) { // If this string is in the image name it's from ECR and needs to be pulled // with the right credentials - ecr_pull(image) + // ecr_pull(image) + sh "echo Pulling from AWS is not implemented && exit 1" } else { sh( script: """ @@ -412,9 +413,9 @@ def fsim_test(image) { ) } -def cmake_build(image, path, make_flag) { +def cmake_build(image, path) { sh ( - script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod", + script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod --build-dir path", label: 'Run cmake build', ) } @@ -443,10 +444,10 @@ def add_hexagon_permissions() { // Run make. First try to do an incremental make from a previous workspace in hope to // accelerate the compilation. If something is wrong, clean the workspace and then // build from scratch. -def make(docker_type, path, make_flag) { +def make(docker_type, path) { timeout(time: max_time, unit: 'MINUTES') { try { - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } catch (hudson.AbortException ae) { // script exited due to user abort, directly throw instead of retry if (ae.getMessage().contains('script returned exit code 143')) { @@ -457,7 +458,7 @@ def make(docker_type, path, make_flag) { script: "${docker_run} ${docker_type} ./tests/scripts/task_clean.sh ${path}", label: 'Clear old cmake workspace', ) - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } } } diff --git a/ci/jenkins/generated/cpu_jenkinsfile.groovy b/ci/jenkins/generated/cpu_jenkinsfile.groovy index 929e17b07a410..0a860f2c3976d 100644 --- a/ci/jenkins/generated/cpu_jenkinsfile.groovy +++ b/ci/jenkins/generated/cpu_jenkinsfile.groovy @@ -45,7 +45,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2022-11-03T15:11:02.874214 +// Generated at 2022-11-15T12:57:47.367598 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -171,7 +171,8 @@ def docker_init(image) { if (image.contains("amazonaws.com")) { // If this string is in the image name it's from ECR and needs to be pulled // with the right credentials - ecr_pull(image) + // ecr_pull(image) + sh "echo Pulling from AWS is not implemented && exit 1" } else { sh( script: """ @@ -412,9 +413,9 @@ def fsim_test(image) { ) } -def cmake_build(image, path, make_flag) { +def cmake_build(image, path) { sh ( - script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod", + script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod --build-dir path", label: 'Run cmake build', ) } @@ -443,10 +444,10 @@ def add_hexagon_permissions() { // Run make. First try to do an incremental make from a previous workspace in hope to // accelerate the compilation. If something is wrong, clean the workspace and then // build from scratch. -def make(docker_type, path, make_flag) { +def make(docker_type, path) { timeout(time: max_time, unit: 'MINUTES') { try { - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } catch (hudson.AbortException ae) { // script exited due to user abort, directly throw instead of retry if (ae.getMessage().contains('script returned exit code 143')) { @@ -457,7 +458,7 @@ def make(docker_type, path, make_flag) { script: "${docker_run} ${docker_type} ./tests/scripts/task_clean.sh ${path}", label: 'Clear old cmake workspace', ) - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } } } @@ -478,7 +479,7 @@ def build() { script: "${docker_run} ${ci_cpu} ./tests/scripts/task_config_build_cpu.sh build", label: 'Create CPU cmake config', ) - make(ci_cpu, 'build', '-j2') + make(ci_cpu, 'build') sh( script: """ set -eux diff --git a/ci/jenkins/generated/docker_jenkinsfile.groovy b/ci/jenkins/generated/docker_jenkinsfile.groovy index a1e59fa8e1da1..3f57ba9d7a337 100644 --- a/ci/jenkins/generated/docker_jenkinsfile.groovy +++ b/ci/jenkins/generated/docker_jenkinsfile.groovy @@ -45,7 +45,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2022-11-03T15:09:47.700341 +// Generated at 2022-11-15T12:57:47.331156 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -171,7 +171,8 @@ def docker_init(image) { if (image.contains("amazonaws.com")) { // If this string is in the image name it's from ECR and needs to be pulled // with the right credentials - ecr_pull(image) + // ecr_pull(image) + sh "echo Pulling from AWS is not implemented && exit 1" } else { sh( script: """ @@ -412,9 +413,9 @@ def fsim_test(image) { ) } -def cmake_build(image, path, make_flag) { +def cmake_build(image, path) { sh ( - script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod", + script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod --build-dir path", label: 'Run cmake build', ) } @@ -443,10 +444,10 @@ def add_hexagon_permissions() { // Run make. First try to do an incremental make from a previous workspace in hope to // accelerate the compilation. If something is wrong, clean the workspace and then // build from scratch. -def make(docker_type, path, make_flag) { +def make(docker_type, path) { timeout(time: max_time, unit: 'MINUTES') { try { - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } catch (hudson.AbortException ae) { // script exited due to user abort, directly throw instead of retry if (ae.getMessage().contains('script returned exit code 143')) { @@ -457,7 +458,7 @@ def make(docker_type, path, make_flag) { script: "${docker_run} ${docker_type} ./tests/scripts/task_clean.sh ${path}", label: 'Clear old cmake workspace', ) - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } } } @@ -752,7 +753,7 @@ def deploy() { } }, 'Tag tlcpackstaging to tlcpack': { - if (env.DOCS_DEPLOY_ENABLED == 'yes') { + if (env.DEPLOY_DOCKER_IMAGES == 'yes') { node('CPU') { ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/tag-images") { timeout(time: max_time, unit: 'MINUTES') { diff --git a/ci/jenkins/generated/gpu_jenkinsfile.groovy b/ci/jenkins/generated/gpu_jenkinsfile.groovy index 66206785c3a3e..31cbf2289652f 100644 --- a/ci/jenkins/generated/gpu_jenkinsfile.groovy +++ b/ci/jenkins/generated/gpu_jenkinsfile.groovy @@ -45,7 +45,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2022-11-03T15:14:22.886221 +// Generated at 2022-11-15T12:57:47.270208 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -171,7 +171,8 @@ def docker_init(image) { if (image.contains("amazonaws.com")) { // If this string is in the image name it's from ECR and needs to be pulled // with the right credentials - ecr_pull(image) + // ecr_pull(image) + sh "echo Pulling from AWS is not implemented && exit 1" } else { sh( script: """ @@ -412,9 +413,9 @@ def fsim_test(image) { ) } -def cmake_build(image, path, make_flag) { +def cmake_build(image, path) { sh ( - script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod", + script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod --build-dir path", label: 'Run cmake build', ) } @@ -443,10 +444,10 @@ def add_hexagon_permissions() { // Run make. First try to do an incremental make from a previous workspace in hope to // accelerate the compilation. If something is wrong, clean the workspace and then // build from scratch. -def make(docker_type, path, make_flag) { +def make(docker_type, path) { timeout(time: max_time, unit: 'MINUTES') { try { - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } catch (hudson.AbortException ae) { // script exited due to user abort, directly throw instead of retry if (ae.getMessage().contains('script returned exit code 143')) { @@ -457,7 +458,7 @@ def make(docker_type, path, make_flag) { script: "${docker_run} ${docker_type} ./tests/scripts/task_clean.sh ${path}", label: 'Clear old cmake workspace', ) - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } } } @@ -475,7 +476,7 @@ def build() { docker_init(ci_gpu) timeout(time: max_time, unit: 'MINUTES') { sh "${docker_run} --no-gpu ${ci_gpu} ./tests/scripts/task_config_build_gpu.sh build" - make("${ci_gpu} --no-gpu", 'build', '-j2') + make("${ci_gpu} --no-gpu", 'build') sh( script: """ set -eux @@ -496,7 +497,7 @@ def build() { // compiler test sh "${docker_run} --no-gpu ${ci_gpu} ./tests/scripts/task_config_build_gpu_other.sh build2" - make("${ci_gpu} --no-gpu", 'build2', '-j2') + make("${ci_gpu} --no-gpu", 'build2') sh( script: """ set -eux diff --git a/ci/jenkins/generated/hexagon_jenkinsfile.groovy b/ci/jenkins/generated/hexagon_jenkinsfile.groovy index 06c801dbffe35..6f7273bb5d0ed 100644 --- a/ci/jenkins/generated/hexagon_jenkinsfile.groovy +++ b/ci/jenkins/generated/hexagon_jenkinsfile.groovy @@ -45,7 +45,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2022-11-03T15:11:02.682266 +// Generated at 2022-11-15T12:57:47.171543 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -171,7 +171,8 @@ def docker_init(image) { if (image.contains("amazonaws.com")) { // If this string is in the image name it's from ECR and needs to be pulled // with the right credentials - ecr_pull(image) + // ecr_pull(image) + sh "echo Pulling from AWS is not implemented && exit 1" } else { sh( script: """ @@ -412,9 +413,9 @@ def fsim_test(image) { ) } -def cmake_build(image, path, make_flag) { +def cmake_build(image, path) { sh ( - script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod", + script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod --build-dir path", label: 'Run cmake build', ) } @@ -443,10 +444,10 @@ def add_hexagon_permissions() { // Run make. First try to do an incremental make from a previous workspace in hope to // accelerate the compilation. If something is wrong, clean the workspace and then // build from scratch. -def make(docker_type, path, make_flag) { +def make(docker_type, path) { timeout(time: max_time, unit: 'MINUTES') { try { - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } catch (hudson.AbortException ae) { // script exited due to user abort, directly throw instead of retry if (ae.getMessage().contains('script returned exit code 143')) { @@ -457,7 +458,7 @@ def make(docker_type, path, make_flag) { script: "${docker_run} ${docker_type} ./tests/scripts/task_clean.sh ${path}", label: 'Clear old cmake workspace', ) - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } } } @@ -478,7 +479,7 @@ def build() { script: "${docker_run} ${ci_hexagon} ./tests/scripts/task_config_build_hexagon.sh build", label: 'Create Hexagon cmake config', ) - make(ci_hexagon, 'build', '-j2') + make(ci_hexagon, 'build') sh ( script: "${docker_run} ${ci_hexagon} ./tests/scripts/task_build_hexagon_api.sh", label: 'Build Hexagon API', diff --git a/ci/jenkins/generated/i386_jenkinsfile.groovy b/ci/jenkins/generated/i386_jenkinsfile.groovy index 15bd2d4dc907e..14920260df1b6 100644 --- a/ci/jenkins/generated/i386_jenkinsfile.groovy +++ b/ci/jenkins/generated/i386_jenkinsfile.groovy @@ -45,7 +45,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2022-11-03T15:11:02.740247 +// Generated at 2022-11-15T12:57:47.231126 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -171,7 +171,8 @@ def docker_init(image) { if (image.contains("amazonaws.com")) { // If this string is in the image name it's from ECR and needs to be pulled // with the right credentials - ecr_pull(image) + // ecr_pull(image) + sh "echo Pulling from AWS is not implemented && exit 1" } else { sh( script: """ @@ -412,9 +413,9 @@ def fsim_test(image) { ) } -def cmake_build(image, path, make_flag) { +def cmake_build(image, path) { sh ( - script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod", + script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod --build-dir path", label: 'Run cmake build', ) } @@ -443,10 +444,10 @@ def add_hexagon_permissions() { // Run make. First try to do an incremental make from a previous workspace in hope to // accelerate the compilation. If something is wrong, clean the workspace and then // build from scratch. -def make(docker_type, path, make_flag) { +def make(docker_type, path) { timeout(time: max_time, unit: 'MINUTES') { try { - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } catch (hudson.AbortException ae) { // script exited due to user abort, directly throw instead of retry if (ae.getMessage().contains('script returned exit code 143')) { @@ -457,7 +458,7 @@ def make(docker_type, path, make_flag) { script: "${docker_run} ${docker_type} ./tests/scripts/task_clean.sh ${path}", label: 'Clear old cmake workspace', ) - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } } } @@ -478,7 +479,7 @@ def build() { script: "${docker_run} ${ci_i386} ./tests/scripts/task_config_build_i386.sh build", label: 'Create i386 cmake config', ) - make(ci_i386, 'build', '-j2') + make(ci_i386, 'build') sh( script: """ set -eux diff --git a/ci/jenkins/generated/lint_jenkinsfile.groovy b/ci/jenkins/generated/lint_jenkinsfile.groovy index 3be4e0ec687f0..0861c113f1f89 100644 --- a/ci/jenkins/generated/lint_jenkinsfile.groovy +++ b/ci/jenkins/generated/lint_jenkinsfile.groovy @@ -45,7 +45,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2022-11-03T15:09:47.665751 +// Generated at 2022-11-15T12:57:47.295572 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -171,7 +171,8 @@ def docker_init(image) { if (image.contains("amazonaws.com")) { // If this string is in the image name it's from ECR and needs to be pulled // with the right credentials - ecr_pull(image) + // ecr_pull(image) + sh "echo Pulling from AWS is not implemented && exit 1" } else { sh( script: """ @@ -412,9 +413,9 @@ def fsim_test(image) { ) } -def cmake_build(image, path, make_flag) { +def cmake_build(image, path) { sh ( - script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod", + script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod --build-dir path", label: 'Run cmake build', ) } @@ -443,10 +444,10 @@ def add_hexagon_permissions() { // Run make. First try to do an incremental make from a previous workspace in hope to // accelerate the compilation. If something is wrong, clean the workspace and then // build from scratch. -def make(docker_type, path, make_flag) { +def make(docker_type, path) { timeout(time: max_time, unit: 'MINUTES') { try { - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } catch (hudson.AbortException ae) { // script exited due to user abort, directly throw instead of retry if (ae.getMessage().contains('script returned exit code 143')) { @@ -457,7 +458,7 @@ def make(docker_type, path, make_flag) { script: "${docker_run} ${docker_type} ./tests/scripts/task_clean.sh ${path}", label: 'Clear old cmake workspace', ) - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } } } diff --git a/ci/jenkins/generated/minimal_jenkinsfile.groovy b/ci/jenkins/generated/minimal_jenkinsfile.groovy index 0e6bd2fc4dd39..57ba1280ac9a0 100644 --- a/ci/jenkins/generated/minimal_jenkinsfile.groovy +++ b/ci/jenkins/generated/minimal_jenkinsfile.groovy @@ -45,7 +45,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2022-11-03T15:11:02.821605 +// Generated at 2022-11-15T12:57:47.313430 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -171,7 +171,8 @@ def docker_init(image) { if (image.contains("amazonaws.com")) { // If this string is in the image name it's from ECR and needs to be pulled // with the right credentials - ecr_pull(image) + // ecr_pull(image) + sh "echo Pulling from AWS is not implemented && exit 1" } else { sh( script: """ @@ -412,9 +413,9 @@ def fsim_test(image) { ) } -def cmake_build(image, path, make_flag) { +def cmake_build(image, path) { sh ( - script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod", + script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod --build-dir path", label: 'Run cmake build', ) } @@ -443,10 +444,10 @@ def add_hexagon_permissions() { // Run make. First try to do an incremental make from a previous workspace in hope to // accelerate the compilation. If something is wrong, clean the workspace and then // build from scratch. -def make(docker_type, path, make_flag) { +def make(docker_type, path) { timeout(time: max_time, unit: 'MINUTES') { try { - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } catch (hudson.AbortException ae) { // script exited due to user abort, directly throw instead of retry if (ae.getMessage().contains('script returned exit code 143')) { @@ -457,7 +458,7 @@ def make(docker_type, path, make_flag) { script: "${docker_run} ${docker_type} ./tests/scripts/task_clean.sh ${path}", label: 'Clear old cmake workspace', ) - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } } } @@ -478,7 +479,7 @@ def build() { script: "${docker_run} ${ci_minimal} ./tests/scripts/task_config_build_minimal.sh build", label: 'Create CPU minimal cmake config', ) - make(ci_minimal, 'build', '-j2') + make(ci_minimal, 'build') sh( script: """ set -eux diff --git a/ci/jenkins/generated/riscv_jenkinsfile.groovy b/ci/jenkins/generated/riscv_jenkinsfile.groovy index 2649cef8bef2d..b6db5fa6436f9 100644 --- a/ci/jenkins/generated/riscv_jenkinsfile.groovy +++ b/ci/jenkins/generated/riscv_jenkinsfile.groovy @@ -45,7 +45,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2022-11-03T15:11:02.722803 +// Generated at 2022-11-15T12:57:47.213033 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -171,7 +171,8 @@ def docker_init(image) { if (image.contains("amazonaws.com")) { // If this string is in the image name it's from ECR and needs to be pulled // with the right credentials - ecr_pull(image) + // ecr_pull(image) + sh "echo Pulling from AWS is not implemented && exit 1" } else { sh( script: """ @@ -412,9 +413,9 @@ def fsim_test(image) { ) } -def cmake_build(image, path, make_flag) { +def cmake_build(image, path) { sh ( - script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod", + script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod --build-dir path", label: 'Run cmake build', ) } @@ -443,10 +444,10 @@ def add_hexagon_permissions() { // Run make. First try to do an incremental make from a previous workspace in hope to // accelerate the compilation. If something is wrong, clean the workspace and then // build from scratch. -def make(docker_type, path, make_flag) { +def make(docker_type, path) { timeout(time: max_time, unit: 'MINUTES') { try { - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } catch (hudson.AbortException ae) { // script exited due to user abort, directly throw instead of retry if (ae.getMessage().contains('script returned exit code 143')) { @@ -457,7 +458,7 @@ def make(docker_type, path, make_flag) { script: "${docker_run} ${docker_type} ./tests/scripts/task_clean.sh ${path}", label: 'Clear old cmake workspace', ) - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } } } @@ -478,7 +479,7 @@ def build() { script: "${docker_run} ${ci_riscv} ./tests/scripts/task_config_build_riscv.sh build", label: 'Create RISC-V cmake config', ) - make(ci_riscv, 'build', '-j2') + make(ci_riscv, 'build') sh( script: """ set -eux diff --git a/ci/jenkins/generated/wasm_jenkinsfile.groovy b/ci/jenkins/generated/wasm_jenkinsfile.groovy index 8070bf7103ee3..778213361109c 100644 --- a/ci/jenkins/generated/wasm_jenkinsfile.groovy +++ b/ci/jenkins/generated/wasm_jenkinsfile.groovy @@ -45,7 +45,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2022-11-03T15:11:02.858375 +// Generated at 2022-11-15T12:57:47.351528 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -171,7 +171,8 @@ def docker_init(image) { if (image.contains("amazonaws.com")) { // If this string is in the image name it's from ECR and needs to be pulled // with the right credentials - ecr_pull(image) + // ecr_pull(image) + sh "echo Pulling from AWS is not implemented && exit 1" } else { sh( script: """ @@ -412,9 +413,9 @@ def fsim_test(image) { ) } -def cmake_build(image, path, make_flag) { +def cmake_build(image, path) { sh ( - script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod", + script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod --build-dir path", label: 'Run cmake build', ) } @@ -443,10 +444,10 @@ def add_hexagon_permissions() { // Run make. First try to do an incremental make from a previous workspace in hope to // accelerate the compilation. If something is wrong, clean the workspace and then // build from scratch. -def make(docker_type, path, make_flag) { +def make(docker_type, path) { timeout(time: max_time, unit: 'MINUTES') { try { - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } catch (hudson.AbortException ae) { // script exited due to user abort, directly throw instead of retry if (ae.getMessage().contains('script returned exit code 143')) { @@ -457,7 +458,7 @@ def make(docker_type, path, make_flag) { script: "${docker_run} ${docker_type} ./tests/scripts/task_clean.sh ${path}", label: 'Clear old cmake workspace', ) - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } } } @@ -478,7 +479,7 @@ def build() { script: "${docker_run} ${ci_wasm} ./tests/scripts/task_config_build_wasm.sh build", label: 'Create WASM cmake config', ) - make(ci_wasm, 'build', '-j2') + make(ci_wasm, 'build') cpp_unittest(ci_wasm) ci_setup(ci_wasm) sh ( diff --git a/ci/jenkins/templates/arm_jenkinsfile.groovy.j2 b/ci/jenkins/templates/arm_jenkinsfile.groovy.j2 index 43d827087dfe1..68e6de555b797 100644 --- a/ci/jenkins/templates/arm_jenkinsfile.groovy.j2 +++ b/ci/jenkins/templates/arm_jenkinsfile.groovy.j2 @@ -12,7 +12,7 @@ script: "${docker_run} ${ci_arm} ./tests/scripts/task_config_build_arm.sh build", label: 'Create ARM cmake config', ) - make(ci_arm, 'build', '-j4') + make(ci_arm, 'build') {{ m.upload_artifacts(tag='arm', filenames=tvm_multilib) }} {% endcall %} diff --git a/ci/jenkins/templates/cpu_jenkinsfile.groovy.j2 b/ci/jenkins/templates/cpu_jenkinsfile.groovy.j2 index 49a957ff33786..571264ab26e80 100644 --- a/ci/jenkins/templates/cpu_jenkinsfile.groovy.j2 +++ b/ci/jenkins/templates/cpu_jenkinsfile.groovy.j2 @@ -12,7 +12,7 @@ script: "${docker_run} ${ci_cpu} ./tests/scripts/task_config_build_cpu.sh build", label: 'Create CPU cmake config', ) - make(ci_cpu, 'build', '-j2') + make(ci_cpu, 'build') {{ m.upload_artifacts(tag='cpu', filenames=tvm_multilib_tsim) }} ci_setup(ci_cpu) // sh "${docker_run} ${ci_cpu} ./tests/scripts/task_golang.sh" diff --git a/ci/jenkins/templates/docker_jenkinsfile.groovy.j2 b/ci/jenkins/templates/docker_jenkinsfile.groovy.j2 index f027051c039b6..12a0a6237e93a 100644 --- a/ci/jenkins/templates/docker_jenkinsfile.groovy.j2 +++ b/ci/jenkins/templates/docker_jenkinsfile.groovy.j2 @@ -178,7 +178,7 @@ def deploy() { {% endcall %} {% call m.deploy_step( name="Tag tlcpackstaging to tlcpack", - feature_flag="env.DOCS_DEPLOY_ENABLED == 'yes'", + feature_flag="env.DEPLOY_DOCKER_IMAGES == 'yes'", ws="tvm/tag-images", ) %} init_git() diff --git a/ci/jenkins/templates/gpu_jenkinsfile.groovy.j2 b/ci/jenkins/templates/gpu_jenkinsfile.groovy.j2 index e28ec02b36e03..f197bfb5febfc 100644 --- a/ci/jenkins/templates/gpu_jenkinsfile.groovy.j2 +++ b/ci/jenkins/templates/gpu_jenkinsfile.groovy.j2 @@ -9,12 +9,12 @@ docker_image='ci_gpu', ) %} sh "${docker_run} --no-gpu ${ci_gpu} ./tests/scripts/task_config_build_gpu.sh build" - make("${ci_gpu} --no-gpu", 'build', '-j2') + make("${ci_gpu} --no-gpu", 'build') {{ m.upload_artifacts(tag='gpu', filenames=tvm_multilib, folders=microtvm_template_projects) }} // compiler test sh "${docker_run} --no-gpu ${ci_gpu} ./tests/scripts/task_config_build_gpu_other.sh build2" - make("${ci_gpu} --no-gpu", 'build2', '-j2') + make("${ci_gpu} --no-gpu", 'build2') {{ m.upload_artifacts(tag='gpu2', filenames=tvm_multilib) }} {% endcall %} diff --git a/ci/jenkins/templates/hexagon_jenkinsfile.groovy.j2 b/ci/jenkins/templates/hexagon_jenkinsfile.groovy.j2 index 3b2b146566bbe..56e00d0f92203 100644 --- a/ci/jenkins/templates/hexagon_jenkinsfile.groovy.j2 +++ b/ci/jenkins/templates/hexagon_jenkinsfile.groovy.j2 @@ -12,7 +12,7 @@ script: "${docker_run} ${ci_hexagon} ./tests/scripts/task_config_build_hexagon.sh build", label: 'Create Hexagon cmake config', ) - make(ci_hexagon, 'build', '-j2') + make(ci_hexagon, 'build') sh ( script: "${docker_run} ${ci_hexagon} ./tests/scripts/task_build_hexagon_api.sh", label: 'Build Hexagon API', diff --git a/ci/jenkins/templates/i386_jenkinsfile.groovy.j2 b/ci/jenkins/templates/i386_jenkinsfile.groovy.j2 index 240e55980289b..6cb62dcc7edec 100644 --- a/ci/jenkins/templates/i386_jenkinsfile.groovy.j2 +++ b/ci/jenkins/templates/i386_jenkinsfile.groovy.j2 @@ -12,7 +12,7 @@ script: "${docker_run} ${ci_i386} ./tests/scripts/task_config_build_i386.sh build", label: 'Create i386 cmake config', ) - make(ci_i386, 'build', '-j2') + make(ci_i386, 'build') {{ m.upload_artifacts(tag='i386', filenames=tvm_multilib_tsim) }} {% endcall %} diff --git a/ci/jenkins/templates/minimal_jenkinsfile.groovy.j2 b/ci/jenkins/templates/minimal_jenkinsfile.groovy.j2 index e002a435b3327..a66c199a9cf79 100644 --- a/ci/jenkins/templates/minimal_jenkinsfile.groovy.j2 +++ b/ci/jenkins/templates/minimal_jenkinsfile.groovy.j2 @@ -12,7 +12,7 @@ script: "${docker_run} ${ci_minimal} ./tests/scripts/task_config_build_minimal.sh build", label: 'Create CPU minimal cmake config', ) - make(ci_minimal, 'build', '-j2') + make(ci_minimal, 'build') {{ m.upload_artifacts(tag='cpu-minimal', filenames=tvm_lib) }} {% endcall %} diff --git a/ci/jenkins/templates/riscv_jenkinsfile.groovy.j2 b/ci/jenkins/templates/riscv_jenkinsfile.groovy.j2 index a82e2f7ddd599..051942c0e064c 100644 --- a/ci/jenkins/templates/riscv_jenkinsfile.groovy.j2 +++ b/ci/jenkins/templates/riscv_jenkinsfile.groovy.j2 @@ -12,7 +12,7 @@ script: "${docker_run} ${ci_riscv} ./tests/scripts/task_config_build_riscv.sh build", label: 'Create RISC-V cmake config', ) - make(ci_riscv, 'build', '-j2') + make(ci_riscv, 'build') {{ m.upload_artifacts(tag='riscv', filenames=tvm_lib, folders=microtvm_template_projects) }} {% endcall %} diff --git a/ci/jenkins/templates/utils/Build.groovy.j2 b/ci/jenkins/templates/utils/Build.groovy.j2 index 91352ba27d487..8c73dae21b100 100644 --- a/ci/jenkins/templates/utils/Build.groovy.j2 +++ b/ci/jenkins/templates/utils/Build.groovy.j2 @@ -19,9 +19,9 @@ def fsim_test(image) { ) } -def cmake_build(image, path, make_flag) { +def cmake_build(image, path) { sh ( - script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod", + script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod --build-dir path", label: 'Run cmake build', ) } @@ -54,10 +54,10 @@ def add_hexagon_permissions() { // Run make. First try to do an incremental make from a previous workspace in hope to // accelerate the compilation. If something is wrong, clean the workspace and then // build from scratch. -def make(docker_type, path, make_flag) { +def make(docker_type, path) { timeout(time: max_time, unit: 'MINUTES') { try { - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } catch (hudson.AbortException ae) { // script exited due to user abort, directly throw instead of retry if (ae.getMessage().contains('script returned exit code 143')) { @@ -68,7 +68,7 @@ def make(docker_type, path, make_flag) { script: "${docker_run} ${docker_type} ./tests/scripts/task_clean.sh ${path}", label: 'Clear old cmake workspace', ) - cmake_build(docker_type, path, make_flag) + cmake_build(docker_type, path) } } } diff --git a/ci/jenkins/templates/utils/Prepare.groovy.j2 b/ci/jenkins/templates/utils/Prepare.groovy.j2 index 2c6f930901279..12fb983cf4abd 100644 --- a/ci/jenkins/templates/utils/Prepare.groovy.j2 +++ b/ci/jenkins/templates/utils/Prepare.groovy.j2 @@ -61,7 +61,8 @@ def docker_init(image) { if (image.contains("amazonaws.com")) { // If this string is in the image name it's from ECR and needs to be pulled // with the right credentials - ecr_pull(image) + // ecr_pull(image) + sh "echo Pulling from AWS is not implemented && exit 1" } else { sh( script: """ diff --git a/ci/jenkins/templates/wasm_jenkinsfile.groovy.j2 b/ci/jenkins/templates/wasm_jenkinsfile.groovy.j2 index cd8da69be7620..44870b11ba096 100644 --- a/ci/jenkins/templates/wasm_jenkinsfile.groovy.j2 +++ b/ci/jenkins/templates/wasm_jenkinsfile.groovy.j2 @@ -12,7 +12,7 @@ script: "${docker_run} ${ci_wasm} ./tests/scripts/task_config_build_wasm.sh build", label: 'Create WASM cmake config', ) - make(ci_wasm, 'build', '-j2') + make(ci_wasm, 'build') cpp_unittest(ci_wasm) ci_setup(ci_wasm) sh (