Skip to content

Commit 0cdd285

Browse files
authored
[CI] Move to use main as the default (#6665)
1 parent 74b6922 commit 0cdd285

File tree

87 files changed

+231
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+231
-231
lines changed

Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ def init_git_win() {
9494
}
9595

9696
def cancel_previous_build() {
97-
// cancel previous build if it is not on master.
98-
if (env.BRANCH_NAME != "master") {
97+
// cancel previous build if it is not on main.
98+
if (env.BRANCH_NAME != "main") {
9999
def buildNumber = env.BUILD_NUMBER as int
100100
// Milestone API allows us to cancel previous build
101101
// with the same milestone number
@@ -328,14 +328,14 @@ stage('Build packages') {
328328
}
329329
}
330330
// Here we could upload the packages to anaconda for releases
331-
// and/or the master branch
331+
// and/or the main branch
332332
}
333333
*/
334334

335335
stage('Deploy') {
336336
node('doc') {
337337
ws(per_exec_ws("tvm/deploy-docs")) {
338-
if (env.BRANCH_NAME == "master") {
338+
if (env.BRANCH_NAME == "main") {
339339
unpack_lib('mydocs', 'docs.tgz')
340340
sh "cp docs.tgz /var/docs/docs.tgz"
341341
sh "tar xf docs.tgz -C /var/docs"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jvminstall:
136136
-Dcflags="$(PKG_CFLAGS)" -Dldflags="$(PKG_LDFLAGS)" \
137137
-Dcurrent_libdir="$(ROOTDIR)/$(OUTPUTDIR)" $(JVM_TEST_ARGS))
138138
format:
139-
./tests/lint/git-clang-format.sh -i origin/master
139+
./tests/lint/git-clang-format.sh -i origin/main
140140
black .
141141
cd rust; which cargo && cargo fmt --all; cd ..
142142

NEWS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2190,7 +2190,7 @@ Rust language support in TVM includes two parts. 1. The frontend wraps the curre
21902190
* Fix benchmark layout in graph tuner (#3926)
21912191
* Fix Android Demo LLVM version (#3962)
21922192
* Cast filepath arguments to string (#3968)
2193-
* Fixes "common" sub crate using nightly and master (#3965)
2193+
* Fixes "common" sub crate using nightly and main (#3965)
21942194
* Changes to make tensorize work. These changes also fix the previously broken test. (#3981)
21952195
* Remove FLOP computation when calling 3rd party library (#4005)
21962196
* Use a more intuitive way to limit the #ops in a group (#4018)
@@ -2254,7 +2254,7 @@ Rust language support in TVM includes two parts. 1. The frontend wraps the curre
22542254

22552255

22562256
### Depreciations
2257-
* Deprecating python2 support in the master branch and following release (v0.6). (#2994, #2986)
2257+
* Deprecating python2 support and following release (v0.6). (#2994, #2986)
22582258
* NNVM is deprecated and will be removed in a future version. (#4333, #4368)
22592259

22602260

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
<!--- specific language governing permissions and limitations -->
1616
<!--- under the License. -->
1717

18-
<img src=https://raw.githubusercontent.com/apache/incubator-tvm-site/master/images/logo/tvm-logo-small.png width=128/> Open Deep Learning Compiler Stack
18+
<img src=https://raw.githubusercontent.com/apache/incubator-tvm-site/main/images/logo/tvm-logo-small.png width=128/> Open Deep Learning Compiler Stack
1919
==============================================
2020
[Documentation](https://tvm.apache.org/docs) |
2121
[Contributors](CONTRIBUTORS.md) |
2222
[Community](https://tvm.apache.org/community) |
2323
[Release Notes](NEWS.md)
2424

25-
[![Build Status](https://ci.tlcpack.ai/buildStatus/icon?job=tvm/master)](https://ci.tlcpack.ai/job/tvm/job/master/)
25+
[![Build Status](https://ci.tlcpack.ai/buildStatus/icon?job=tvm/main)](https://ci.tlcpack.ai/job/tvm/job/main/)
2626
[![WinMacBuild](https://github.com/apache/incubator-tvm/workflows/WinMacBuild/badge.svg)](https://github.com/apache/incubator-tvm/actions?query=workflow%3AWinMacBuild)
2727

2828
Apache TVM (incubating) is a compiler stack for deep learning systems. It is designed to close the gap between the

apps/android_deploy/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Alternatively, you may execute Docker image we provide which contains the requir
3434

3535
### Build APK
3636

37-
Before you build the Android application, please refer to [TVM4J Installation Guide](https://github.com/apache/incubator-tvm/blob/master/jvm/README.md) and install tvm4j-core to your local maven repository. You can find tvm4j dependency declare in `app/build.gradle`. Modify it if it is necessary.
37+
Before you build the Android application, please refer to [TVM4J Installation Guide](https://github.com/apache/incubator-tvm/blob/main/jvm/README.md) and install tvm4j-core to your local maven repository. You can find tvm4j dependency declare in `app/build.gradle`. Modify it if it is necessary.
3838

3939
```
4040
dependencies {
@@ -124,7 +124,7 @@ If everything goes well, you will find compile tools in `/opt/android-toolchain-
124124

125125
Follow instruction to get compiled version model for android target [here.](https://tvm.apache.org/docs/deploy/android.html)
126126

127-
Copied these compiled model deploy_lib.so, deploy_graph.json and deploy_param.params to apps/android_deploy/app/src/main/assets/ and modify TVM flavor changes on [java](https://github.com/apache/incubator-tvm/blob/master/apps/android_deploy/app/src/main/java/org/apache/tvm/android/demo/MainActivity.java#L81)
127+
Copied these compiled model deploy_lib.so, deploy_graph.json and deploy_param.params to apps/android_deploy/app/src/main/assets/ and modify TVM flavor changes on [java](https://github.com/apache/incubator-tvm/blob/main/apps/android_deploy/app/src/main/java/org/apache/tvm/android/demo/MainActivity.java#L81)
128128

129129
`CPU Verison flavor`
130130
```

apps/android_rpc/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ You will need JDK, [Android NDK](https://developer.android.com/ndk) and an Andro
2828

2929
We use [Gradle](https://gradle.org) to build. Please follow [the installation instruction](https://gradle.org/install) for your operating system.
3030

31-
Before you build the Android application, please refer to [TVM4J Installation Guide](https://github.com/apache/incubator-tvm/blob/master/jvm/README.md) and install tvm4j-core to your local maven repository. You can find tvm4j dependency declare in `app/build.gradle`. Modify it if it is necessary.
31+
Before you build the Android application, please refer to [TVM4J Installation Guide](https://github.com/apache/incubator-tvm/blob/main/jvm/README.md) and install tvm4j-core to your local maven repository. You can find tvm4j dependency declare in `app/build.gradle`. Modify it if it is necessary.
3232

3333
```
3434
dependencies {
@@ -146,7 +146,7 @@ android 1 1 0
146146
```
147147

148148

149-
Then checkout [android\_rpc/tests/android\_rpc\_test.py](https://github.com/apache/incubator-tvm/blob/master/apps/android_rpc/tests/android_rpc_test.py) and run,
149+
Then checkout [android\_rpc/tests/android\_rpc\_test.py](https://github.com/apache/incubator-tvm/blob/main/apps/android_rpc/tests/android_rpc_test.py) and run,
150150

151151
```bash
152152
# Specify the RPC tracker
@@ -157,7 +157,7 @@ export TVM_NDK_CC=/opt/android-toolchain-arm64/bin/aarch64-linux-android-g++
157157
python android_rpc_test.py
158158
```
159159

160-
This will compile TVM IR to shared libraries (CPU, OpenCL and Vulkan) and run vector addition on your Android device. To verify compiled TVM IR shared libraries on OpenCL target set `'test_opencl = True'` and on Vulkan target set `'test_vulkan = True'` in [tests/android_rpc_test.py](https://github.com/apache/incubator-tvm/blob/master/apps/android_rpc/tests/android_rpc_test.py), by default on CPU target will execute.
160+
This will compile TVM IR to shared libraries (CPU, OpenCL and Vulkan) and run vector addition on your Android device. To verify compiled TVM IR shared libraries on OpenCL target set `'test_opencl = True'` and on Vulkan target set `'test_vulkan = True'` in [tests/android_rpc_test.py](https://github.com/apache/incubator-tvm/blob/main/apps/android_rpc/tests/android_rpc_test.py), by default on CPU target will execute.
161161
On my test device, it gives following results.
162162

163163
```bash

apps/benchmark/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ python3 -m tvm.exec.rpc_tracker
7878
`python3 -m tvm.exec.rpc_server --tracker=10.77.1.123:9190 --key=rk3399`, where 10.77.1.123 is the IP address of the tracker.
7979

8080
* For Android device
81-
* Build and install tvm RPC apk on your device [Help](https://github.com/apache/incubator-tvm/tree/master/apps/android_rpc).
81+
* Build and install tvm RPC apk on your device [Help](https://github.com/apache/incubator-tvm/tree/main/apps/android_rpc).
8282
Make sure you can pass the android rpc test. Then you have alreadly known how to register.
8383

8484
3. Verify the device registration

apps/ios_rpc/tests/ios_rpc_mobilenet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def compile_metal(src):
6161

6262

6363
def prepare_input():
64-
img_url = "https://github.com/dmlc/mxnet.js/blob/master/data/cat.png?raw=true"
64+
img_url = "https://github.com/dmlc/mxnet.js/blob/main/data/cat.png?raw=true"
6565
img_name = "cat.png"
6666
synset_url = "".join(
6767
[

apps/wasm-standalone/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
## Motivation
3939

40-
<img src="https://github.com/dmlc/web-data/raw/master/tvm/tutorial/tvm_support_list.png" alt="TVM hardware support" width="600"/>
40+
<img src="https://github.com/dmlc/web-data/raw/main/tvm/tutorial/tvm_support_list.png" alt="TVM hardware support" width="600"/>
4141

4242
As demonstrated in TVM runtime [tutorials](https://tvm.apache.org/docs/tutorials/get_started/relay_quick_start.html), TVM already supports WASM as the optional hardware backend, so we can leverage the features of WebAssembly (portability, security) and TVM runtime (domain-specific, optimization) to build a flexible and auto-optimized graph compiler for all deep learning frameworks.
4343

@@ -165,7 +165,7 @@ Options:
165165
Next perform model inference using these commands below:
166166
```
167167
$ cp ../../../wasm-graph/lib/wasm_graph_resnet50.wasm ./
168-
$ wget -O cat.png https://github.com/dmlc/mxnet.js/blob/master/data/cat.png?raw=true
168+
$ wget -O cat.png https://github.com/dmlc/mxnet.js/blob/main/data/cat.png?raw=true
169169
$ wget -O synset.csv https://raw.githubusercontent.com/kazum/tvm-wasm/master/synset.csv
170170
$ ./target/debug/test_graph_resnet50 -g ./wasm_graph_resnet50.wasm -i ./cat.png -l ./synset.csv
171171
original image dimensions: (256, 256)

docker/lint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function run_lint_step() {
4545
# NOTE: need to run git status to update some docker-side cache. Otherwise,
4646
# git-clang-format will fail with "The following files would be modified but have
4747
# unstaged changes:"
48-
cmd=( bash -c 'git status &>/dev/null && tests/lint/git-clang-format.sh -i origin/master' )
48+
cmd=( bash -c 'git status &>/dev/null && tests/lint/git-clang-format.sh -i origin/main' )
4949
fi
5050
;;
5151
cpplint)
@@ -58,7 +58,7 @@ function run_lint_step() {
5858
if [ $inplace_fix -eq 0 ]; then
5959
cmd=( tests/lint/python_format.sh )
6060
else
61-
cmd=( tests/lint/git-black.sh -i origin/master )
61+
cmd=( tests/lint/git-black.sh -i origin/main )
6262
fi
6363
;;
6464
jnilint)

0 commit comments

Comments
 (0)