From 5faaadb75cccfef2cefbf8f2d22cd59345bb9028 Mon Sep 17 00:00:00 2001 From: lkdvos Date: Fri, 5 Apr 2024 19:03:17 +0200 Subject: [PATCH 1/4] Add dependabot action --- .github/dependabot.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..ff6499d --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" # Location of package manifests + schedule: + interval: "weekly" \ No newline at end of file From 4d16a5ab76ac324d03a5d9dc693bf8e9bc58fb17 Mon Sep 17 00:00:00 2001 From: lkdvos Date: Sat, 6 Apr 2024 08:54:02 +0200 Subject: [PATCH 2/4] Update actions --- .github/workflows/CompatHelper.yml | 39 ++++-------------------- .github/workflows/FormatCheck.yml | 32 ++++++++++++++++++++ .github/workflows/TagBot.yml | 4 +-- .github/workflows/ci-julia-nightly.yml | 13 +++++--- .github/workflows/ci.yml | 11 ++++--- .github/workflows/format_check.yml | 42 -------------------------- .gitignore | 3 +- 7 files changed, 56 insertions(+), 88 deletions(-) create mode 100644 .github/workflows/FormatCheck.yml delete mode 100644 .github/workflows/format_check.yml diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml index 3dfba52..e2fbe0d 100644 --- a/.github/workflows/CompatHelper.yml +++ b/.github/workflows/CompatHelper.yml @@ -1,45 +1,18 @@ name: CompatHelper + on: schedule: - cron: 0 0 * * * workflow_dispatch: -permissions: - contents: write - pull-requests: write + jobs: CompatHelper: runs-on: ubuntu-latest steps: - - name: Check if Julia is already available in the PATH - id: julia_in_path - run: which julia - continue-on-error: true - - name: Install Julia, but only if it is not already available in the PATH - uses: julia-actions/setup-julia@v1 - with: - version: '1' - arch: ${{ runner.arch }} - if: steps.julia_in_path.outcome != 'success' - - name: "Add the General registry via Git" - run: | - import Pkg - ENV["JULIA_PKG_SERVER"] = "" - Pkg.Registry.add("General") - shell: julia --color=yes {0} - - name: "Install CompatHelper" - run: | - import Pkg - name = "CompatHelper" - uuid = "aa819f21-2bde-4658-8897-bab36330d9b7" - version = "3" - Pkg.add(; name, uuid, version) - shell: julia --color=yes {0} - - name: "Run CompatHelper" - run: | - import CompatHelper - CompatHelper.main() - shell: julia --color=yes {0} + - name: Pkg.add("CompatHelper") + run: julia -e 'using Pkg; Pkg.add("CompatHelper")' + - name: CompatHelper.main() env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }} - # COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }} \ No newline at end of file + run: julia -e 'using CompatHelper; CompatHelper.main()' \ No newline at end of file diff --git a/.github/workflows/FormatCheck.yml b/.github/workflows/FormatCheck.yml new file mode 100644 index 0000000..493b4ff --- /dev/null +++ b/.github/workflows/FormatCheck.yml @@ -0,0 +1,32 @@ +name: FormatCheck + +on: + push: + branches: + - 'master' + tags: '*' + pull_request: + branches: + - 'master' +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + version: + - '1' # automatically expands to the latest stable 1.x release of Julia + os: + - ubuntu-latest + arch: + - x64 + steps: + - uses: julia-actions/setup-julia@latest + with: + version: ${{ matrix.version }} + arch: ${{ matrix.arch }} + + - uses: actions/checkout@v4 + - name: Install JuliaFormatter and format + run: | + julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter"))' + julia -e 'using JuliaFormatter; format(".", verbose=true)' \ No newline at end of file diff --git a/.github/workflows/TagBot.yml b/.github/workflows/TagBot.yml index 3042569..e948a35 100644 --- a/.github/workflows/TagBot.yml +++ b/.github/workflows/TagBot.yml @@ -28,6 +28,4 @@ jobs: - uses: JuliaRegistries/TagBot@v1 with: token: ${{ secrets.GITHUB_TOKEN }} - # Edit the following line to reflect the actual name of the GitHub Secret containing your private key - ssh: ${{ secrets.DOCUMENTER_KEY }} - # ssh: ${{ secrets.NAME_OF_MY_SSH_PRIVATE_KEY_SECRET }} \ No newline at end of file + ssh: ${{ secrets.DOCUMENTER_KEY }} \ No newline at end of file diff --git a/.github/workflows/ci-julia-nightly.yml b/.github/workflows/ci-julia-nightly.yml index 3bd44c5..fef833d 100644 --- a/.github/workflows/ci-julia-nightly.yml +++ b/.github/workflows/ci-julia-nightly.yml @@ -1,4 +1,4 @@ -name: CI (Julia nightly) +name: CI - nightly on: - push - pull_request @@ -14,20 +14,23 @@ jobs: os: - ubuntu-latest - macOS-latest - - windows-latest + # - windows-latest # does not work on windows arch: - x64 steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} + - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@latest - uses: julia-actions/julia-runtest@latest env: JULIA_NUM_THREADS: 4 - uses: julia-actions/julia-processcoverage@v1 - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v4 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: file: lcov.info diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea73d3a..3fba9bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,20 +15,23 @@ jobs: os: - ubuntu-latest - macOS-latest - - windows-latest + # - windows-latest # does not work on windows arch: - x64 steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} + - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@latest - uses: julia-actions/julia-runtest@latest env: JULIA_NUM_THREADS: 4 - uses: julia-actions/julia-processcoverage@v1 - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v4 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: file: lcov.info diff --git a/.github/workflows/format_check.yml b/.github/workflows/format_check.yml deleted file mode 100644 index eb7d11d..0000000 --- a/.github/workflows/format_check.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: format-check - -on: - push: - branches: - - 'master' - - 'release-' - tags: '*' - pull_request: - -jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - julia-version: [1] - julia-arch: [x86] - os: [ubuntu-latest] - steps: - - uses: julia-actions/setup-julia@latest - with: - version: ${{ matrix.julia-version }} - - - uses: actions/checkout@v1 - - name: Install JuliaFormatter and format - # This will use the latest version by default but you can set the version like so: - # - # julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter", version="0.13.0"))' - run: | - julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter"))' - julia -e 'using JuliaFormatter; format(".", verbose=true)' - - name: Format check - run: | - julia -e ' - out = Cmd(`git diff --name-only`) |> read |> String - if out == "" - exit(0) - else - @error "Some files have not been formatted !!!" - write(stdout, out) - exit(1) - end' \ No newline at end of file diff --git a/.gitignore b/.gitignore index 0ee3d17..99fc848 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.jl.cov *.jl.*.cov *.jl.mem -Manifest.toml \ No newline at end of file +Manifest.toml +.vscode/ \ No newline at end of file From dc37bc4f39eff00d7c399cbb7ef442cf517173c9 Mon Sep 17 00:00:00 2001 From: lkdvos Date: Sat, 6 Apr 2024 08:56:42 +0200 Subject: [PATCH 3/4] Update README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 83ab121..97b9c4a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # TensorOperationsTBLIS.jl -[tblis](https://github.com/devinamatthews/tblis) wrapper for [TensorOperations.jl](https://github.com/Jutho/TensorOperations.jl) +Julia wrapper for [tblis](https://github.com/devinamatthews/tblis) with [TensorOperations.jl](https://github.com/Jutho/TensorOperations.jl). [![CI][ci-img]][ci-url] [![CI (Julia nightly)][ci-julia-nightly-img]][ci-julia-nightly-url] [![][codecov-img]][codecov-url] @@ -13,7 +13,7 @@ [codecov-img]: https://codecov.io/gh/lkdvos/TensorOperationsTBLIS.jl/branch/master/graph/badge.svg [codecov-url]: https://codecov.io/gh/lkdvos/TensorOperationsTBLIS.jl -Currently provides implementations of `tensorcontract!` and `tensoradd!` for +Currently provides implementations of `tensorcontract!`, `tensoradd!` and `tensortrace!` for `StridedArray{<:BlasFloat}`. These can be accessed through the backend system of TensorOperations, i.e. From 2e6cec454777df0d2136fbcf6b52b510dc07372d Mon Sep 17 00:00:00 2001 From: lkdvos Date: Sat, 6 Apr 2024 08:57:23 +0200 Subject: [PATCH 4/4] Bump version to v0.1.1 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index d4f43b6..4c5f7a6 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "TensorOperationsTBLIS" uuid = "1e289f0c-8058-4c3e-8acf-f8ef036bd865" authors = ["lkdvos "] -version = "0.1.0" +version = "0.1.1" [deps] Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"