Skip to content

Commit

Permalink
Merge branch 'main' into legalize_tensorcore_2
Browse files Browse the repository at this point in the history
Conflicts:
	python/tvm/topi/nn/batch_matmul.py
	python/tvm/topi/nn/dense.py
  • Loading branch information
Meteorix committed Jan 11, 2021
2 parents 3270634 + 4911a08 commit 25dac28
Show file tree
Hide file tree
Showing 186 changed files with 5,332 additions and 1,533 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/vta-hw
6 changes: 6 additions & 0 deletions apps/bundle_deploy/bundle.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,9 @@ tvm_crt_error_t TVMPlatformMemoryAllocate(size_t num_bytes, DLContext ctx, void*
tvm_crt_error_t TVMPlatformMemoryFree(void* ptr, DLContext ctx) {
return g_memory_manager->Free(g_memory_manager, ptr, ctx);
}

tvm_crt_error_t TVMPlatformTimerStart() { return kTvmErrorFunctionCallNotImplemented; }

tvm_crt_error_t TVMPlatformTimerStop(double* elapsed_time_seconds) {
return kTvmErrorFunctionCallNotImplemented;
}
6 changes: 6 additions & 0 deletions apps/bundle_deploy/bundle_static.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,9 @@ tvm_crt_error_t TVMPlatformMemoryAllocate(size_t num_bytes, DLContext ctx, void*
tvm_crt_error_t TVMPlatformMemoryFree(void* ptr, DLContext ctx) {
return g_memory_manager->Free(g_memory_manager, ptr, ctx);
}

tvm_crt_error_t TVMPlatformTimerStart() { return kTvmErrorFunctionCallNotImplemented; }

tvm_crt_error_t TVMPlatformTimerStop(double* elapsed_time_seconds) {
return kTvmErrorFunctionCallNotImplemented;
}
4 changes: 2 additions & 2 deletions apps/microtvm/reference-vm/zephyr/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ importer-keras = ["tensorflow", "tensorflow-estimator"]
importer-onnx = ["onnx", "onnxruntime", "torch", "torchvision", "future"]
importer-pytorch = ["torch", "torchvision", "future"]
importer-tensorflow = ["tensorflow", "tensorflow-estimator"]
importer-tflite = ["tlfite", "tensorflow", "tensorflow-estimator"]
importer-tflite = ["tflite", "tensorflow", "tensorflow-estimator"]

[tool.poetry.dev-dependencies]
autodocsumm = "^0.1"
black = "^19.10b0"
sphinx = "^3.0"
sphinx-gallery = "^0.4"
sphinx-gallery = "^0.8"
sphinx-rtd-theme = "^0.4"
matplotlib = "^3.2"
Image = "^1.5"
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.demo_cpu
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

# Minimum docker image for demo purposes
# prebuilt-image: tvmai/demo-cpu
FROM tvmai/ci-cpu:v0.55
FROM tlcpack/ci-cpu:v0.55

# Jupyter notebook.
RUN pip3 install matplotlib Image Pillow jupyter[notebook]
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.demo_gpu
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Minimum docker image for demo purposes
# CI docker GPU env
# tag: v0.54
FROM tvmai/ci-gpu:v0.55
FROM tlcpack/ci-gpu:v0.55

# Jupyter notebook.
RUN pip3 install matplotlib Image "Pillow<7" jupyter[notebook]
Expand Down
7 changes: 6 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,12 @@
"tune_relay_arm.py",
"tune_relay_mobile_gpu.py",
],
"auto_scheduler": ["tune_matmul_x86.py", "tune_conv2d_layer_cuda.py"],
"auto_scheduler": [
"tune_matmul_x86.py",
"tune_conv2d_layer_cuda.py",
"tune_network_x86.py",
"tune_network_cuda.py",
],
"dev": ["low_level_custom_pass.py", "use_pass_infra.py", "bring_your_own_datatypes.py"],
}

Expand Down
2 changes: 1 addition & 1 deletion docs/contribute/code_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ You can also use the following command via docker.

.. code:: bash
docker/bash.sh tvmai/ci-lint clang-format-10 [path-to-file]
docker/bash.sh tlcpack/ci-lint clang-format-10 [path-to-file]
clang-format is also not perfect, when necessary, you can use disble clang-format on certain code regions.
Expand Down
4 changes: 2 additions & 2 deletions docs/contribute/pull_request.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ This is a quick guide to submit a pull request, please also refer to the detaile
# While the lint commands used should be identical to those run in CI, this command reproduces
# the CI lint procedure exactly (typically helpful for debugging lint script errors).
docker/bash.sh tvmai/ci-lint ./tests/scripts/task_lint.sh
docker/bash.sh tlcpack/ci-lint ./tests/scripts/task_lint.sh
When the clang-format lint check fails, run git-clang-format as follows to automatically reformat
your code:

.. code:: bash
# Run clang-format check for all the files that changed since upstream/main
docker/bash.sh tvmai/ci-lint ./tests/lint/git-clang-format.sh upstream/main
docker/bash.sh tlcpack/ci-lint ./tests/lint/git-clang-format.sh upstream/main
- Add test-cases to cover the new features or bugfix the patch introduces.
- Document the code you wrote, see more at :ref:`doc_guide`
Expand Down
2 changes: 1 addition & 1 deletion docs/dev/benchmark.rst
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Here is sample data encoded as JSON:
"timestamp":"20191123003411",
"schema_version":"0.1",
"metadata":{
"docker_tag":"tvmai/ci-gpu:v0.53"
"docker_tag":"tlcpack/ci-gpu:v0.53"
},
"workload_args":{
"input_shape_dict":{
Expand Down
12 changes: 10 additions & 2 deletions docs/dev/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ In this guide, we will study an example compilation flow in the compiler. The fi
- Runtime Execution: the user loads back a `runtime.Module` and runs the compiled functions in the supported runtime environment.


.. figure:: https://raw.githubusercontent.com/tvmai/web-data/main/images/design/tvm_dyn_workflow.svg
.. figure:: https://raw.githubusercontent.com/tlcpack/web-data/main/images/design/tvm_dyn_workflow.svg
:align: center
:width: 85%

Expand Down Expand Up @@ -201,7 +201,7 @@ except that the data structure of interest changes from the numpy.ndarray to tvm
Logical Architecture Components
-------------------------------

.. figure:: https://raw.githubusercontent.com/tvmai/web-data/main/images/design/tvm_static_overview.svg
.. figure:: https://raw.githubusercontent.com/tlcpack/web-data/main/images/design/tvm_static_overview.svg
:align: center
:width: 85%

Expand Down Expand Up @@ -396,3 +396,11 @@ Security
:maxdepth: 1

security


microTVM
--------
.. toctree::
:maxdepth: 1

microtvm_design
Loading

0 comments on commit 25dac28

Please sign in to comment.