Skip to content

Commit 8b5b9f1

Browse files
author
Colin Davidson
committed
TBD
1 parent a09f5c1 commit 8b5b9f1

9 files changed

Lines changed: 67 additions & 23 deletions

File tree

.github/workflows/publish_docs.yml

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name: Deploy Jekyll with GitHub Pages dependencies preinstalled
33

44
on:
5+
# branch_protection_rule:
56
# Runs on pushes targeting the default branch
67
push:
78
branches: ["colin/publish_docs"]
@@ -23,19 +24,68 @@ concurrency:
2324

2425
jobs:
2526
# Build job
26-
build:
27-
if: github.repository == 'uxlfoundation/oneapi-construction-kit' || github.event_name == 'workflow_dispatch'
27+
# build_rfc:
28+
# # if: github.repository == 'uxlfoundation/oneapi-construction-kit' || github.event_name == 'workflow_dispatch'
29+
# if: github.repository == 'coldav/oneapi-construction-kit' || github.event_name == 'workflow_dispatch'
30+
# runs-on: ubuntu-latest
31+
# steps:
32+
# - name: Checkout
33+
# uses: actions/checkout@v4
34+
# with:
35+
# ref: rfcs
36+
# - name: Setup Pages
37+
# uses: actions/configure-pages@v5
38+
# - name: Build with Jekyll
39+
# uses: actions/jekyll-build-pages@v1
40+
# with:
41+
# source: ./
42+
# destination: ./_site/rfcs
43+
# - name: Upload artifact
44+
# uses: actions/upload-pages-artifact@v3
45+
46+
build_ock_docs:
47+
# if: github.repository == 'uxlfoundation/oneapi-construction-kit' || github.event_name == 'workflow_dispatch'
48+
if: github.repository == 'coldav/oneapi-construction-kit' || github.event_name == 'workflow_dispatch'
2849
runs-on: ubuntu-latest
2950
steps:
3051
- name: Checkout
3152
uses: actions/checkout@v4
32-
ref: rfcs
53+
54+
- uses: actions/setup-python@v5
55+
with:
56+
python-version: 3.9
57+
58+
- name: Install apt package
59+
run: |
60+
sudo apt-get update
61+
sudo apt-get install -y doxygen virtualenv
62+
63+
- name: Install prerequisites
64+
run: python -m pip install -r doc/requirements.txt
65+
66+
- name: Build Documentation
67+
working-directory: ${{github.workspace}}
68+
run: |
69+
cmake -DCMAKE_BUILD_TYPE=Debug -DCA_RUNTIME_COMPILER_ENABLED=OFF -DCA_CL_ENABLE_OFFLINE_KERNEL_TESTS=OFF -DOCL_EXTENSION_cl_khr_il_program=OFF -Bbuild_doc
70+
cmake --build build_doc --target doc_html
71+
72+
- name: Checkout
73+
uses: actions/checkout@v4
74+
with:
75+
ref: rfcs
76+
path: rfcs
77+
78+
- name: Move rfcs to build_doc
79+
shell: bash
80+
run:
81+
mv rfcs build_doc/doc
82+
3383
- name: Setup Pages
3484
uses: actions/configure-pages@v5
3585
- name: Build with Jekyll
3686
uses: actions/jekyll-build-pages@v1
3787
with:
38-
source: ./
88+
source: ./build_doc/doc
3989
destination: ./_site
4090
- name: Upload artifact
4191
uses: actions/upload-pages-artifact@v3
@@ -46,7 +96,7 @@ jobs:
4696
name: github-pages
4797
url: ${{ steps.deployment.outputs.page_url }}
4898
runs-on: ubuntu-latest
49-
needs: build
99+
needs: [ build_ock_docs ]
50100
steps:
51101
- name: Deploy to GitHub Pages
52102
id: deployment

doc/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ endif()
118118
add_custom_target(doc_html
119119
COMMAND ${SPHINX_BUILD} --color -b html
120120
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/html
121-
DEPENDS doc-copy doxygen
121+
DEPENDS doc-copy
122+
# doxygen
122123
USES_TERMINAL COMMENT "Generate Documentation HTML")
123124

124125
# PDF documentation generatation is not currently supported on Windows since

doc/cmake/FindModules.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ FindGitClangFormat Module
3939
.. seealso::
4040
Used to implement the :doc:`/cmake/Format`.
4141

42-
FindLLVMTool Module
42+
ImportLLVM Module
4343
###################
4444

45-
.. cmake-module:: ../../cmake/FindLLVMTool.cmake
45+
.. cmake-module:: ../../cmake/ImportLLVM.cmake
4646

4747
FindLit Module
4848
##############

doc/developer-guide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ To cross-compile LLVM the appropriate CMake toolchain file from the oneAPI
745745
Construction Kit repository may be used; the path to this repository will be
746746
specified by the `$ONEAPI_CON_KIT` variable in the following examples.
747747

748-
##### Cross-compiling LLVM for ARM
748+
#### Cross-compiling LLVM for ARM
749749

750750
For cross-compilation targeting ARM, only the `ARM` target back end needs to be
751751
enabled. Run the following command to configure an LLVM build targeting ARM from
@@ -770,7 +770,7 @@ Now the build directory is configured, build the `install` target.
770770
ninja -C build-arm install
771771
```
772772

773-
##### Cross-compiling LLVM for AArch64
773+
#### Cross-compiling LLVM for AArch64
774774

775775
For cross-compilation targeting AArch64 only the `AArch64` target back end needs
776776
to be enabled. Run the following command to configure an LLVM build targeting
@@ -795,7 +795,7 @@ Now the build directory is configured, build the `install` target.
795795
ninja -C build-aarch64 install
796796
```
797797

798-
##### Cross-compiling LLVM for RISC-V
798+
#### Cross-compiling LLVM for RISC-V
799799

800800
For cross-compilation targeting RISC-V only the `RISCV` target back end needs
801801
to be enabled. Run the following command to configure an LLVM build targeting

doc/getting-started.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ configuration.
113113
* `Git`_
114114
* `CMake`_ 3.4.3+
115115
* `Python`_ 3.6.9+
116-
* `Vulkan SDK`_ 1.1.97+
116+
* `LunarG Vulkan SDK packages`_ 1.1.97+
117117

118118
Windows 10 does not provide an adequate package manager. However, the
119119
third-party `Chocolatey <https://chocolatey.org/install#install-with-cmdexe>`_

doc/modules/mux.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ ComputeMux
99
CMake <mux/cmake>
1010
Bumping the Specification Version <mux/bumping-the-spec>
1111

12-
.. toctree::
13-
:hidden:
14-
15-
mux/hal/dynamic_loading
16-
1712
.. seealso::
1813
The :doc:`/specifications/mux-runtime-spec` and the
1914
:doc:`/specifications/mux-compiler-spec`.

doc/modules/mux/changes.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ version increases mean backward compatible bug fixes have been applied.
5353

5454
* Several ``compiler::BaseModule`` methods and fields have been reworked to
5555
make compilation of OpenCL less stateful.
56-
* The class-member lists of macro defs and OpenCL options have been removed,
56+
- The class-member lists of macro defs and OpenCL options have been removed,
5757
and are set up and torn down on the fly when compiling OpenCL C.
58-
* Several methods such as ``compiler::BaseModule::populatePPOpts`` are now
58+
- Several methods such as ``compiler::BaseModule::populatePPOpts`` are now
5959
``const``.
60-
* ``compiler::BaseModule::executeOpenCLAction`` has been removed.
60+
- ``compiler::BaseModule::executeOpenCLAction`` has been removed.
6161

6262
0.73.0
6363
------

doc/overview/compiler/ir.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,8 +624,7 @@ the `OpenCL C atomic`_ and `OpenCL C fence`_ operations and the `SPIR-V atomic`_
624624
and `SPIR-V barrier`_ operations. Synchronization on non-atomic memory access
625625
is defined by a *memory consistency model*. The memory consistency requirements
626626
made on the instruction listed in the Mux compiler spec enables the oneAPI
627-
Construction Kit to support the higher level `OpenCL memory consistency model`_
628-
and the `Vulkan memory model`_.
627+
Construction Kit to support the higher level `OpenCL memory consistency model`_.
629628

630629
.. _OpenCL C atomic:
631630
https://www.khronos.org/registry/OpenCL/specs/3.0-unified/html/OpenCL_C.html#atomic-functions

doc/specifications.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ Specifications
77
specifications/versioning
88
specifications/mux-runtime-spec
99
specifications/mux-compiler-spec
10-
specifications/hal

0 commit comments

Comments
 (0)