Skip to content

Commit

Permalink
Update github branch names etc (NFC) (iree-org#15482)
Browse files Browse the repository at this point in the history
Outdated branch names given renaming.
  • Loading branch information
jpienaar authored Nov 8, 2023
1 parent 3a3c1a4 commit a4b8ccb
Show file tree
Hide file tree
Showing 16 changed files with 24 additions and 29 deletions.
4 changes: 2 additions & 2 deletions build_tools/bazel/build_core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
# set.
# IREE_VULKAN_DISABLE: Do not run tests that require Vulkan. Default: 0
# BUILD_TAG_FILTERS: Passed to bazel to filter targets to build.
# See https://docs.bazel.build/versions/master/command-line-reference.html#flag--build_tag_filters)
# See https://bazel.build/reference/command-line-reference.html#flag--build_tag_filters)
# Default: "-nokokoro"
# TEST_TAG_FILTERS: Passed to bazel to filter targets to test. Note that test
# targets excluded this way will also not be built.
# See https://docs.bazel.build/versions/master/command-line-reference.html#flag--test_tag_filters)
# See https://bazel.build/reference/command-line-reference.html#flag--test_tag_filters)
# Default: If IREE_VULKAN_DISABLE=1, "-nokokoro,-driver=vulkan". Else "-nokokoro".

set -xeuo pipefail
Expand Down
2 changes: 1 addition & 1 deletion build_tools/bazel/iree.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test --test_output=errors
# Enables unix-style runfiles link trees on Windows. Requires enabling symlink
# permissions: Enable Developer Mode in the Developer Settings page of the
# system settings. See
# https://docs.bazel.build/versions/master/windows.html#enable-symlink-support
# https://bazel.build/configure/windows#enable-symlink-support
# and https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10/
startup --windows_enable_symlinks
build --enable_runfiles
Expand Down
2 changes: 1 addition & 1 deletion build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ def glob(self, include, exclude=None, exclude_directories=1):
# bazel's glob has some specific restrictions about crossing package
# boundaries. We have no uses of recursive globs. Rather than try to
# emulate them or silently give different behavior, just error out.
# See https://docs.bazel.build/versions/master/be/functions.html#glob
# See https://bazel.build/reference/be/functions.html#glob
raise NotImplementedError("Recursive globs not supported")
# Bazel `*.mlir` glob -> CMake Variable `_GLOB_X_MLIR`
var = "_GLOB_" + pattern.replace("*", "X").replace(".", "_").upper()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace HAL {
//
// For details on the linking process and file formats, see:
// * https://lld.llvm.org/WebAssembly.html
// * https://github.com/WebAssembly/tool-conventions/blob/master/Linking.md
// * https://github.com/WebAssembly/tool-conventions/blob/main/Linking.md
//
// For more background on WebAssembly, see:
// * https://webassembly.org/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def VK_CooperativeMatrixPropertiesKHRAttr :

// TODO(antiagainst): consider auto-generating this file (or part of it) from
// vk.xml:
// https://raw.githubusercontent.com/KhronosGroup/Vulkan-Docs/master/xml/vk.xml
// https://raw.githubusercontent.com/KhronosGroup/Vulkan-Docs/main/xml/vk.xml

// Dictionary attribute containing various Vulkan capability bits. This is
// aggregated from various Vulkan properties, limits, features from the spec.
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/iree/compiler/Tools/iree_compile_lib.cc
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ int mlir::iree_compiler::runIreecMain(int argc, char **argv) {
"o", llvm::cl::desc("Output filename"), llvm::cl::value_desc("filename"),
llvm::cl::init("-"), llvm::cl::cat(mainOptions));

// The output format flag is the master control for what we do with the
// The output format flag is the primary control for what we do with the
// in-memory compiled form.
llvm::cl::opt<OutputFormat> outputFormat(
"output-format", llvm::cl::desc("Format of compiled output"),
Expand Down
2 changes: 1 addition & 1 deletion docs/api_docs/python/index.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. IREE Python API documentation master file, created by
.. IREE Python API documentation main file, created by
sphinx-quickstart on Sat Sep 25 16:59:09 2021.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Expand Down
8 changes: 4 additions & 4 deletions docs/website/docs/building-from-source/riscv.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@ ${QEMU_BIN} \
toolchain and the emulator, build the tools from the following sources:

* RISC-V toolchain is built from
<https://github.com/llvm/llvm-project> (main branch).
<https://github.com/llvm/llvm-project>.
* Currently, the LLVM compiler is built on GNU toolchain, including libgcc,
GNU linker, and C libraries. You need to build GNU toolchain first.
* Clone GNU toolchain from:
<https://github.com/riscv/riscv-gnu-toolchain>
(master branch). Switch the "riscv-binutils" submodule to
`git://sourceware.org/git/binutils-gdb.git` (master branch) manually.
<https://github.com/riscv/riscv-gnu-toolchain>.
Switch the "riscv-binutils" submodule to
`git://sourceware.org/git/binutils-gdb.git` manually.
* RISC-V QEMU is built from
<https://gitlab.com/qemu-project/qemu/tree/v8.1.2>.

Expand Down
2 changes: 1 addition & 1 deletion docs/website/docs/developers/building/cmake-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ if the current build type is Debug and the compiler supports it.
## Cross-compilation

When cross compiling (using a toolchain file like
[`android.toolchain.cmake`](https://android.googlesource.com/platform/ndk/+/master/build/cmake/android.toolchain.cmake)),
[`android.toolchain.cmake`](https://android.googlesource.com/platform/ndk/+/main/build/cmake/android.toolchain.cmake)),
first build and install IREE's tools for your host configuration, then use the
`IREE_HOST_BIN_DIR` CMake option to point the cross compiled build at the
host tools.
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ adb shell simpleperf list

There is no `simpleperf annotate`. The `simpleperf` documentation lists a couple
of
[ways](https://android.googlesource.com/platform/system/extras/+/master/simpleperf/doc/README.md#show-annotated-source-code-and-disassembly)
[ways](https://android.googlesource.com/platform/system/extras/+/main/simpleperf/doc/README.md#show-annotated-source-code-and-disassembly)
of achieving the same thing.

However:
Expand Down
12 changes: 6 additions & 6 deletions docs/website/docs/developers/vulkan-environment-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,12 @@ display at the server side, for example:
export DISPLAY=:0
```

[VulkanArchOverview]: https://github.com/KhronosGroup/Vulkan-Loader/blob/master/loader/LoaderAndLayerInterface.md#overview
[VulkanArchPicture]: https://raw.githubusercontent.com/KhronosGroup/Vulkan-Loader/master/docs/images/high_level_loader.png
[VulkanICD]: https://github.com/KhronosGroup/Vulkan-Loader/blob/master/loader/LoaderAndLayerInterface.md#installable-client-drivers
[VulkanLayer]: https://github.com/KhronosGroup/Vulkan-Loader/blob/master/loader/LoaderAndLayerInterface.md#layers
[VulkanLoader]: https://github.com/KhronosGroup/Vulkan-Loader/blob/master/loader/LoaderAndLayerInterface.md#the-loader
[VulkanLoaderEnvVars]: https://github.com/KhronosGroup/Vulkan-Loader/blob/master/loader/LoaderAndLayerInterface.md#table-of-debug-environment-variables
[VulkanArchOverview]: https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md#overview
[VulkanArchPicture]: https://raw.githubusercontent.com/KhronosGroup/Vulkan-Loader/main/docs/images/high_level_loader.png
[VulkanICD]: https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md#installable-client-drivers
[VulkanLayer]: https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md#layers
[VulkanLoader]: https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md#the-loader
[VulkanLoaderEnvVars]: https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md#table-of-debug-environment-variables
[VulkanLoaderSource]: https://github.com/KhronosGroup/Vulkan-Loader
[VulkanSDK]: https://www.lunarg.com/vulkan-sdk/
[VulkanValidationLayersSource]: https://github.com/KhronosGroup/Vulkan-ValidationLayers
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/iree/base/internal/fpu_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// iree_fpu_state_t
//==============================================================================
// https://github.com/petewarden/tensorflow_makefile/blob/master/tensorflow/core/platform/denormal.cc
// https://chromium.googlesource.com/chromium/blink/+/master/Source/platform/audio/DenormalDisabler.h
// https://chromium.googlesource.com/chromium/blink/+/main/Source/platform/audio/DenormalDisabler.h

static uint64_t iree_fpu_state_set_dtz(uint64_t state, bool denormals_to_zero);

Expand Down
2 changes: 1 addition & 1 deletion runtime/src/iree/base/internal/synchronization.h
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ void iree_slim_mutex_unlock(iree_slim_mutex_t* mutex)
// http://www.1024cores.net/home/lock-free-algorithms/eventcounts
// https://software.intel.com/en-us/forums/intel-threading-building-blocks/topic/299245
// https://github.com/r10a/Event-Counts
// https://github.com/facebook/folly/blob/master/folly/experimental/EventCount.h
// https://github.com/facebook/folly/blob/main/folly/experimental/EventCount.h
// https://github.com/concurrencykit/ck/blob/master/include/ck_ec.h
typedef struct iree_notification_t {
#if IREE_SYNCHRONIZATION_DISABLE_UNSAFE
Expand Down
2 changes: 1 addition & 1 deletion samples/colab/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ TFLite | [tflite_text_classification](tflite_text_classification.ipynb) | Compil
## Working with GitHub

Refer to
[Colab's GitHub demo](https://colab.research.google.com/github/googlecolab/colabtools/blob/master/notebooks/colab-github-demo.ipynb)
[Colab's GitHub demo](https://colab.research.google.com/github/googlecolab/colabtools/blob/main/notebooks/colab-github-demo.ipynb)
for general information about using Colab with GitHub.

To make changes to a notebook in this repository, one possible workflow is:
Expand Down
5 changes: 0 additions & 5 deletions samples/colab/dummy.py

This file was deleted.

2 changes: 1 addition & 1 deletion tools/android/run_module_app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ When started on Android, the app will read the contents in `assets` to get the
VM FlatBuffer and invocation information and run it.

[native-activity]: https://developer.android.com/reference/android/app/NativeActivity
[native-activity-example]: https://github.com/android/ndk-samples/tree/master/native-activity
[native-activity-example]: https://github.com/android/ndk-samples/tree/main/native-activity
[native-activity-tutorial]: https://medium.com/androiddevelopers/getting-started-with-c-and-android-native-activities-2213b402ffff

0 comments on commit a4b8ccb

Please sign in to comment.