You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by ar...@apache.org on 2021/03/19 17:11:59 UTC

[tvm] branch ci-docker-staging updated (53e3656 -> f0796a6)

This is an automated email from the ASF dual-hosted git repository.

areusch pushed a change to branch ci-docker-staging
in repository https://gitbox.apache.org/repos/asf/tvm.git.


 discard 53e3656  update to staging containers
    omit 431a7d6  Default value for graph_runtime Init lookup_linked_param_func (#7676)
    omit 45442ed  [Relay][Training][Pass] Factor out first-order AD to a module pass (#7677)
    omit c976a07  [RUNTIME] Add libbacktrace for backtraces with line numbers (#7153)
    omit 38aed59  [TVMC] Allow optional arguments to be passed to importers (#7674)
    omit 4976bb2  [Relay] Add TopPattern to nn.dropout (#7685)
    omit ab86aa6  [Relay][QNN] Relax simulated qnn tests to prevent flakiness. (#7684)
    omit c871784  [Frontend,TOPI] Improve dynamism for BatchMatmul and Dense (#7496)
    omit 5c460ff  [COMMUNITY] @areusch -> Committer (#7679)
    omit 60ff0c7  [Runtime] Extend Graph Runtime To Support Cuda Graph Launch (#7616)
    omit c55608f  [SPIRV] Declare int64 capability by default (#7681)
    omit 4abbe49  [Torch] Remove unnecessary reshapes for batch_matmul (#7675)
    omit e697f03  Fix relay.testing.darknet convert_image (#7667)
    omit b8b63cd  add nvcc support (#7668)
     add 7a38c7f  Couple of small fixes:
     add 443a429  Adding Zephyr demo runtime.
     add 280479a  Cleanup of uTVM tests and demo runtime.
     add b62ab38  Working on QEMU support.
     add 853f01e  Adding board-specific prj.conf files.
     add 4b1da9a  Some cleanup.
     add 058985b  Lots of hacking to get ONNX model to run on QEMU and nRF5340.
     add fe2c9a1  Lots of hacking to get ONNX model to run on QEMU and nRF5340.
     add 763017e  Adding data for unit tests.
     add df722b8  Cleanup demo_runtime code.
     add 6645f50  Fix up tutorial.
     add b6ae7cf  Fix tutorial.
     add 8934c19  Fix tutorial and runtime.
     add 6a38dc9  Some docstring fixes.
     add 82cee46  Couple of small fixes:
     add 545a241  Adding Zephyr demo runtime.
     add c611d30  Cleanup of uTVM tests and demo runtime.
     add 28b92de  Working on QEMU support.
     add 123c64c  Adding board-specific prj.conf files.
     add bc87450  Some cleanup.
     add 98f3475  Lots of hacking to get ONNX model to run on QEMU and nRF5340.
     add a9ffc96  Adding data for unit tests.
     add d249161  Cleanup demo_runtime code.
     add d04e04d  Fix up tutorial.
     add ec5b004  Merge branch 'mdw/demo-runtime' of github.com:mdw-octoml/tvm into mdw/demo-runtime
     add fbdc1cb  Fix merge conflicts.
     add ec2c374  Fix merge conflict.
     add 2b14aa1  Remove redundant files.
     add 0db2207  Revert dep.
     add 687c09c  Fixup
     add bcce620  Add new files to check_file_type.py.
     add f1260df  Adding missing ONNX file.
     add 599c5fb  Fixup docs.
     add c552fa9  Fix linting rule.
     add 3271923  small fixes
     add 0bb5d85  Merge remote-tracking branch 'upstream/main' into mdw/demo-runtime
     add f672577  Add missing file to check_file_type.py.
     add 12cdd03  clang-format this file.
     add a87f3e8  Fix formatting.
     add f2b665b  Black formatting.
     add 65f0b4e  Lint comments.
     add 37e0bce  Fix path for test.
     new f0796a6  add ci-qemu-staging

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (53e3656)
            \
             N -- N -- N   refs/heads/ci-docker-staging (f0796a6)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmodules                                        |   3 -
 3rdparty/libbacktrace                              |   1 -
 CMakeLists.txt                                     |  63 +--
 CONTRIBUTORS.md                                    |   1 -
 Jenkinsfile                                        |   6 +-
 .../android_camera/app/src/main/jni/Application.mk |   4 +-
 apps/android_camera/app/src/main/jni/tvm_runtime.h |  38 +-
 .../android_deploy/app/src/main/jni/Application.mk |   2 +-
 apps/android_deploy/app/src/main/jni/tvm_runtime.h |   3 -
 apps/android_rpc/app/src/main/jni/Application.mk   |   2 +-
 apps/android_rpc/app/src/main/jni/tvm_runtime.h    |  36 +-
 apps/bundle_deploy/Makefile                        |   6 +-
 apps/dso_plugin_module/Makefile                    |   3 +-
 apps/extension/Makefile                            |   3 +-
 apps/ios_rpc/tvmrpc.xcodeproj/project.pbxproj      |   6 -
 apps/ios_rpc/tvmrpc/TVMRuntime.h                   |   2 +-
 apps/ios_rpc/tvmrpc/TVMRuntime.mm                  |  16 +-
 apps/ios_rpc/tvmrpc/ViewController.mm              |   4 +-
 apps/microtvm/README.md                            |  17 +-
 .../{reference-vm/zephyr => }/pyproject.toml       |  10 +-
 .../picojson => apps/microtvm/zephyr}/README.md    |   3 +-
 .../microtvm/zephyr/demo_runtime}/CMakeLists.txt   |   1 -
 .../microtvm/zephyr/demo_runtime}/README.md        |   7 +-
 .../boards/nrf5340dk_nrf5340_cpuapp.conf           |  22 +-
 .../zephyr/demo_runtime/boards/nucleo_f746zg.conf  |  26 +-
 .../zephyr/demo_runtime/boards/qemu_x86.conf       |   7 +-
 .../microtvm/zephyr/demo_runtime}/crt/crt_config.h |   2 +-
 .../microtvm/zephyr/demo_runtime}/prj.conf         |   7 +-
 .../demo_runtime}/qemu-hack/qemu-system-i386       |   0
 .../microtvm/zephyr/demo_runtime}/src/main.c       | 225 +++++++----
 cmake/config.cmake                                 |   8 -
 cmake/modules/CUDA.cmake                           |  11 -
 cmake/modules/Libbacktrace.cmake                   |  45 ---
 cmake/modules/VTA.cmake                            |   3 -
 docker/Dockerfile.ci_qemu                          |   4 +
 docker/install/ubuntu_install_zephyr.sh            |  69 +---
 docs/microtvm/index.rst                            |   2 +-
 golang/Makefile                                    |   2 +-
 include/tvm/ir/attrs.h                             |   4 +-
 include/tvm/ir/diagnostic.h                        |   9 -
 include/tvm/ir/error.h                             |  26 +-
 include/tvm/ir/type_relation.h                     |   2 +-
 include/tvm/relay/analysis.h                       |   2 +-
 include/tvm/runtime/container.h                    |   1 -
 include/tvm/runtime/data_type.h                    |   2 +-
 include/tvm/runtime/logging.h                      | 438 ---------------------
 include/tvm/runtime/object.h                       |   2 +-
 include/tvm/runtime/packed_func.h                  |   6 +-
 include/tvm/runtime/vm/bytecode.h                  |   2 +-
 include/tvm/support/logging.h                      | 158 ++++++++
 include/tvm/support/with.h                         |   2 +-
 licenses/LICENSE.libbacktrace.txt                  |  29 --
 python/setup.py                                    |   2 +-
 python/tvm/_ffi/base.py                            |   4 +-
 python/tvm/contrib/cc.py                           |  16 +-
 python/tvm/contrib/cuda_graph/__init__.py          |  16 -
 .../tvm/contrib/cuda_graph/cuda_graph_runtime.py   | 134 -------
 python/tvm/contrib/nvcc.py                         |  12 -
 python/tvm/driver/tvmc/frontends.py                |  27 +-
 python/tvm/micro/build.py                          |   2 +-
 python/tvm/micro/contrib/zephyr.py                 |   5 +-
 python/tvm/relay/frontend/pytorch.py               |  29 +-
 python/tvm/relay/frontend/tensorflow.py            |  54 +--
 python/tvm/relay/testing/darknet.py                |   2 +-
 python/tvm/relay/transform/transform.py            |  26 +-
 python/tvm/runtime/module.py                       |   5 +-
 python/tvm/target/target.py                        |  20 +-
 python/tvm/testing.py                              |  19 -
 python/tvm/topi/cuda/batch_matmul.py               |   7 +-
 python/tvm/topi/cuda/dense.py                      |  11 +-
 src/auto_scheduler/compute_dag.cc                  |   2 +-
 src/auto_scheduler/feature.cc                      |   2 +-
 .../search_policy/sketch_policy_rules.cc           |   4 +-
 src/auto_scheduler/transform_step.cc               |   2 +-
 src/ir/error.cc                                    |   3 +-
 src/parser/parser.cc                               |   8 +-
 src/parser/span_check.h                            |   2 +-
 src/relay/analysis/annotated_region_set.cc         |   5 +-
 src/relay/analysis/kind_check.cc                   |   2 +-
 src/relay/analysis/type_solver.cc                  |   4 +-
 src/relay/analysis/well_formed.cc                  |   2 +-
 src/relay/backend/contrib/codegen_c/codegen_c.h    |   2 -
 src/relay/backend/vm/compiler.cc                   |   2 +-
 src/relay/backend/vm/compiler.h                    |   2 +-
 src/relay/backend/vm/inline_primitives.cc          |   2 +-
 src/relay/backend/vm/lambda_lift.cc                |   2 +-
 src/relay/backend/vm/removed_unused_funcs.cc       |   2 +-
 src/relay/op/nn/convolution.h                      |   2 +-
 src/relay/op/nn/nn.cc                              |   1 -
 src/relay/op/tensor/transform.cc                   |  12 +-
 src/relay/op/tensor/transform.h                    |   4 +-
 src/relay/op/type_relations.cc                     |   2 +-
 src/relay/qnn/op/concatenate.cc                    |  14 +-
 src/relay/transforms/first_order_gradient.cc       | 309 ---------------
 src/relay/transforms/fold_explicit_padding.cc      |   2 +-
 .../{higher_order_gradient.cc => gradient.cc}      | 274 ++++++++++++-
 src/relay/transforms/gradient.h                    |  54 ---
 src/relay/transforms/inline.cc                     |   2 +-
 src/relay/transforms/memory_alloc.cc               |   2 +-
 src/relay/transforms/partial_eval.cc               |   4 +-
 src/relay/transforms/simplify_expr.cc              |   2 +-
 src/relay/transforms/to_a_normal_form.cc           |   2 +-
 src/relay/transforms/to_basic_block_normal_form.cc |   2 +-
 src/relay/transforms/type_infer.cc                 |   2 +-
 src/runtime/c_runtime_api.cc                       |   6 +-
 src/runtime/contrib/cblas/cblas.cc                 |   2 +-
 src/runtime/contrib/cblas/mkl.cc                   |   2 +-
 src/runtime/contrib/cblas/mkldnn.cc                |   2 +-
 src/runtime/contrib/cublas/cublas.cc               |   2 +-
 src/runtime/contrib/cublas/cublas_utils.h          |   2 +-
 src/runtime/contrib/cudnn/cudnn_utils.h            |   2 +-
 src/runtime/contrib/miopen/miopen_utils.h          |   2 +-
 src/runtime/contrib/mps/mps_utils.h                |   2 +-
 src/runtime/contrib/nnpack/convolution.cc          |   2 +-
 src/runtime/contrib/nnpack/fully_connected.cc      |   2 +-
 src/runtime/contrib/nnpack/nnpack_utils.h          |   2 +-
 src/runtime/contrib/random/mt_random_engine.cc     |   2 +-
 src/runtime/contrib/random/random.cc               |   2 +-
 src/runtime/contrib/rocblas/rocblas.cc             |   2 +-
 src/runtime/contrib/tensorrt/tensorrt_logger.h     |   2 +-
 src/runtime/contrib/vitis_ai/vitis_ai_runtime.cc   |   1 -
 src/runtime/cpu_device_api.cc                      |   2 +-
 src/runtime/crt/Makefile                           |   4 +-
 src/runtime/crt/graph_runtime/load_json.c          |   2 +-
 src/runtime/file_utils.cc                          |   2 +-
 .../graph/cuda_graph/graph_runtime_cuda_graph.cc   | 135 -------
 src/runtime/graph/graph_runtime.cc                 |   7 +-
 src/runtime/graph/graph_runtime.h                  |   5 +-
 src/runtime/graph/graph_runtime_factory.cc         |  33 --
 src/runtime/graph/graph_runtime_factory.h          |   8 -
 src/runtime/hexagon/hexagon_device_api.cc          |   2 +-
 src/runtime/hexagon/hexagon_module.cc              |   2 +-
 src/runtime/hexagon/hexagon_module.h               |   2 +-
 src/runtime/hexagon/sim/hexagon_device_sim.cc      |   2 +-
 src/runtime/hexagon/target/hexagon_dsprpcapi.cc    |   2 +-
 src/runtime/hexagon/target/hexagon_dsprpcapi.h     |   2 +-
 src/runtime/hexagon/target/hexagon_stubapi.cc      |   2 +-
 src/runtime/hexagon/target/hexagon_stubapi.h       |   2 +-
 src/runtime/logging.cc                             | 151 -------
 src/runtime/metal/metal_common.h                   |   2 +-
 src/runtime/micro/micro_session.cc                 |   2 +-
 src/runtime/minrpc/minrpc_server.h                 |   2 +-
 src/runtime/ndarray.cc                             |   2 +-
 src/runtime/object.cc                              |   2 +-
 src/runtime/opencl/opencl_common.h                 |   2 +-
 src/runtime/registry.cc                            |   2 +-
 src/runtime/rocm/rocm_device_api.cc                |   2 +-
 src/runtime/rpc/rpc_device_api.cc                  |   4 +-
 src/runtime/rpc/rpc_endpoint.cc                    |  10 +-
 src/runtime/rpc/rpc_module.cc                      |   4 +-
 src/runtime/rpc/rpc_session.cc                     |   8 +-
 src/runtime/runtime_base.h                         |   6 +-
 src/runtime/thread_pool.cc                         |   2 +-
 src/runtime/threading_backend.cc                   |   2 +-
 src/runtime/vm/bytecode.cc                         |   2 +-
 src/runtime/vm/vm.cc                               |   2 +-
 src/runtime/vulkan/vulkan_common.h                 |   2 +-
 src/runtime/vulkan/vulkan_shader.h                 |   2 +-
 src/support/base64.h                               |   2 +-
 src/support/parallel_for.cc                        |   2 +-
 src/support/pipe.h                                 |   2 +-
 src/support/socket.h                               |   2 +-
 src/target/llvm/llvm_common.cc                     |   2 +-
 src/target/source/source_module.cc                 |   2 +-
 src/target/spirv/ir_builder.cc                     |   2 -
 src/target/target.cc                               |  81 ++--
 tests/cpp/ir_functor_test.cc                       |   2 +-
 tests/cpp/parallel_for_test.cc                     |   2 +-
 tests/lint/check_file_type.py                      |  15 +-
 tests/micro/qemu/.gitignore                        |   2 -
 tests/micro/qemu/zephyr-runtime/.gitignore         |   3 -
 tests/micro/qemu/zephyr-runtime/sample.yaml        |  22 --
 .../howto_deploy => tests/micro/zephyr}/README.md  |  29 +-
 tests/micro/{qemu => zephyr}/conftest.py           |   3 +
 tests/micro/{qemu => zephyr}/test_zephyr.py        |  66 +++-
 tests/micro/zephyr/testdata/digit-2.jpg            | Bin 0 -> 572 bytes
 tests/micro/zephyr/testdata/digit-9.jpg            | Bin 0 -> 535 bytes
 tests/micro/zephyr/testdata/mnist-8.onnx           | Bin 0 -> 26454 bytes
 tests/python/driver/tvmc/test_frontends.py         |  22 +-
 tests/python/frontend/tensorflow/test_forward.py   |  52 +--
 tests/python/relay/test_ir_parser.py               |   8 +-
 tests/python/relay/test_ir_text_printer.py         |   5 +
 .../relay/test_op_qnn_simulated_dequantize.py      |  10 +-
 .../python/relay/test_op_qnn_simulated_quantize.py |  17 +-
 tests/python/topi/python/test_topi_qnn.py          |   8 +-
 .../unittest/test_runtime_graph_cuda_graph.py      | 100 -----
 .../test_runtime_module_based_interface.py         |  30 --
 tests/scripts/task_build.sh                        |   2 +-
 tests/scripts/task_python_microtvm.sh              |   2 +-
 tutorials/auto_scheduler/tune_network_cuda.py      |   2 +-
 tutorials/auto_scheduler/tune_network_mali.py      |   2 +-
 tutorials/auto_scheduler/tune_network_x86.py       |   2 +-
 tutorials/micro/micro_onnx.py                      | 213 ++++++++++
 tutorials/micro/micro_tflite.py                    |   7 +-
 web/emcc/tvmjs_support.cc                          |   8 +-
 web/emcc/wasm_runtime.cc                           |  10 +-
 web/emcc/webgpu_runtime.cc                         |  25 +-
 197 files changed, 1287 insertions(+), 2421 deletions(-)
 delete mode 160000 3rdparty/libbacktrace
 rename apps/microtvm/{reference-vm/zephyr => }/pyproject.toml (95%)
 copy {3rdparty/picojson => apps/microtvm/zephyr}/README.md (90%)
 rename {tests/micro/qemu/zephyr-runtime => apps/microtvm/zephyr/demo_runtime}/CMakeLists.txt (99%)
 copy {3rdparty/picojson => apps/microtvm/zephyr/demo_runtime}/README.md (78%)
 copy docker/install/ubuntu_install_onnx.sh => apps/microtvm/zephyr/demo_runtime/boards/nrf5340dk_nrf5340_cpuapp.conf (71%)
 mode change 100755 => 100644
 copy rust/tvm/tests/basics/Cargo.toml => apps/microtvm/zephyr/demo_runtime/boards/nucleo_f746zg.conf (74%)
 copy python/tvm/auto_scheduler/_ffi_api.py => apps/microtvm/zephyr/demo_runtime/boards/qemu_x86.conf (78%)
 rename {tests/micro/qemu/zephyr-runtime => apps/microtvm/zephyr/demo_runtime}/crt/crt_config.h (98%)
 rename {tests/micro/qemu/zephyr-runtime => apps/microtvm/zephyr/demo_runtime}/prj.conf (87%)
 rename {tests/micro/qemu/zephyr-runtime => apps/microtvm/zephyr/demo_runtime}/qemu-hack/qemu-system-i386 (100%)
 rename {tests/micro/qemu/zephyr-runtime => apps/microtvm/zephyr/demo_runtime}/src/main.c (56%)
 delete mode 100644 cmake/modules/Libbacktrace.cmake
 delete mode 100644 include/tvm/runtime/logging.h
 create mode 100644 include/tvm/support/logging.h
 delete mode 100644 licenses/LICENSE.libbacktrace.txt
 delete mode 100644 python/tvm/contrib/cuda_graph/__init__.py
 delete mode 100644 python/tvm/contrib/cuda_graph/cuda_graph_runtime.py
 mode change 100644 => 100755 src/auto_scheduler/transform_step.cc
 delete mode 100644 src/relay/transforms/first_order_gradient.cc
 rename src/relay/transforms/{higher_order_gradient.cc => gradient.cc} (64%)
 delete mode 100644 src/relay/transforms/gradient.h
 delete mode 100644 src/runtime/graph/cuda_graph/graph_runtime_cuda_graph.cc
 delete mode 100644 src/runtime/logging.cc
 delete mode 100644 tests/micro/qemu/.gitignore
 delete mode 100644 tests/micro/qemu/zephyr-runtime/.gitignore
 delete mode 100644 tests/micro/qemu/zephyr-runtime/sample.yaml
 copy {apps/howto_deploy => tests/micro/zephyr}/README.md (53%)
 rename tests/micro/{qemu => zephyr}/conftest.py (94%)
 rename tests/micro/{qemu => zephyr}/test_zephyr.py (81%)
 create mode 100644 tests/micro/zephyr/testdata/digit-2.jpg
 create mode 100644 tests/micro/zephyr/testdata/digit-9.jpg
 create mode 100644 tests/micro/zephyr/testdata/mnist-8.onnx
 delete mode 100644 tests/python/unittest/test_runtime_graph_cuda_graph.py
 create mode 100755 tutorials/micro/micro_onnx.py

[tvm] 01/01: add ci-qemu-staging

Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

areusch pushed a commit to branch ci-docker-staging
in repository https://gitbox.apache.org/repos/asf/tvm.git

commit f0796a6b126a334607e7242b086be463f6f4def9
Author: Andrew Reusch <ar...@octoml.ai>
AuthorDate: Thu Mar 18 17:22:08 2021 -0700

    add ci-qemu-staging
---
 3rdparty/dmlc-core                      |  2 +-
 Jenkinsfile                             |  2 +-
 docker/Dockerfile.ci_qemu               |  4 ++
 docker/install/ubuntu_install_zephyr.sh | 69 +--------------------------------
 4 files changed, 8 insertions(+), 69 deletions(-)

diff --git a/3rdparty/dmlc-core b/3rdparty/dmlc-core
index 6c401e2..21cc7de 160000
--- a/3rdparty/dmlc-core
+++ b/3rdparty/dmlc-core
@@ -1 +1 @@
-Subproject commit 6c401e242c59a1f4c913918246591bb13fd714e7
+Subproject commit 21cc7de0dc9fd6acb796e1be6181fa8e6b6c8f41
diff --git a/Jenkinsfile b/Jenkinsfile
index 506dcab..c2e8a5e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,7 +49,7 @@ ci_gpu = "tlcpack/ci-gpu:v0.72"
 ci_cpu = "tlcpack/ci-cpu:v0.72-t0"
 ci_wasm = "tlcpack/ci-wasm:v0.70"
 ci_i386 = "tlcpack/ci-i386:v0.72-t0"
-ci_qemu = "tlcpack/ci-qemu:v0.01"
+ci_qemu = "areusch1/ci-qemu-staging:v0.02"
 ci_arm = "tlcpack/ci-arm:v0.02"
 // <--- End of regex-scanned config.
 
diff --git a/docker/Dockerfile.ci_qemu b/docker/Dockerfile.ci_qemu
index 9120f91..04434b7 100644
--- a/docker/Dockerfile.ci_qemu
+++ b/docker/Dockerfile.ci_qemu
@@ -64,3 +64,7 @@ RUN bash /install/ubuntu_install_qemu.sh
 COPY install/ubuntu_install_zephyr.sh /install/ubuntu_install_zephyr.sh
 RUN bash /install/ubuntu_install_zephyr.sh
 ENV ZEPHYR_BASE=/opt/zephyrproject/zephyr
+
+# Install ONNX
+COPY install/ubuntu_install_onnx.sh /install/ubuntu_install_onnx.sh
+RUN bash /install/ubuntu_install_onnx.sh
diff --git a/docker/install/ubuntu_install_zephyr.sh b/docker/install/ubuntu_install_zephyr.sh
index e10ff48..1654ab9 100644
--- a/docker/install/ubuntu_install_zephyr.sh
+++ b/docker/install/ubuntu_install_zephyr.sh
@@ -33,73 +33,8 @@ sudo apt-get install -y --no-install-recommends \
      python3-dev python3-pip python3-setuptools python3-tk python3-wheel python3-venv \
      xz-utils file make gcc gcc-multilib g++-multilib apt-transport-https
 
-cat <<EOF | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=0GnF
------END PGP PUBLIC KEY BLOCK-----
-
-EOF
+wget --no-verbose https://apt.kitware.com/keys/kitware-archive-latest.asc
+sudo apt-key add kitware-archive-latest.asc
 
 sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
 sudo apt-get update