Skip to content

Commit 97ce468

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # Project.toml
2 parents 46b7bd7 + 8159073 commit 97ce468

Some content is hidden

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

48 files changed

+2925
-342
lines changed

.github/workflows/CI-localjll.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ jobs:
3939
env:
4040
TMPDIR: ${{ github.workspace }}/tmp
4141
steps:
42+
- name: Free Disk Space
43+
uses: jlumbroso/free-disk-space@main
44+
with:
45+
tool-cache: false
46+
if: ${{ startsWith(matrix.os, 'ubuntu-') }}
47+
- name: Clean `/opt`
48+
run: sudo rm -rf /opt/*
4249
- uses: actions/checkout@v4
4350
- name: Create TMPDIR
4451
run: |

.github/workflows/CI.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ jobs:
3333
timeout-minutes: 90
3434
name: Julia ${{ matrix.version }} - ${{ matrix.test_group }} - ${{ matrix.os }} - ${{ matrix.runtime }} - assertions=${{ matrix.assertions }} - ${{ github.event_name }}
3535
runs-on: ${{ matrix.os }}
36+
container:
37+
image: ${{ contains(matrix.os, 'linux') && 'ghcr.io/enzymead/reactant-docker-images:main' || '' }}
3638
strategy:
3739
fail-fast: false
3840
matrix:
@@ -59,6 +61,11 @@ jobs:
5961
assertions:
6062
- false
6163
include:
64+
- os: linux-x86-ct6e-180-4tpu
65+
version: "1.11"
66+
assertions: false
67+
test_group: core
68+
runtime: "IFRT"
6269
- os: ubuntu-24.04
6370
version: "1.10"
6471
assertions: true
@@ -86,9 +93,13 @@ jobs:
8693
# libReactant: packaged
8794
# version: '1.10'
8895
# test_group: integration
89-
env:
90-
TMPDIR: ${{ github.workspace }}/tmp
9196
steps:
97+
- name: Set TMPDIR
98+
# We have to use `${GITHUB_WORKSPACE}` instead of `github.workspace` because GitHub
99+
# is terrible and the two don't match inside containers:
100+
# https://github.com/actions/runner/issues/2058
101+
run: |
102+
echo "TMPDIR=${GITHUB_WORKSPACE}/tmp" >> ${GITHUB_ENV}
92103
- uses: actions/checkout@v4
93104
- name: Create TMPDIR
94105
run: |

Project.toml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "Reactant"
22
uuid = "3c362404-f566-11ee-1572-e11a4b42c853"
33
authors = ["William Moses <[email protected]>", "Valentin Churavy <[email protected]>", "Sergio Sánchez Ramírez <[email protected]>", "Paul Berg <[email protected]>", "Avik Pal <[email protected]>", "Mosè Giordano <[email protected]>"]
4-
version = "0.2.144"
4+
version = "0.2.149"
55

66
[deps]
77
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -27,11 +27,15 @@ Reactant_jll = "0192cb87-2b54-54ad-80e0-3be72ad8a3c0"
2727
ScopedValues = "7e506255-f358-4e82-b7e4-beb19740aa63"
2828
Scratch = "6c6a2e73-6563-6170-7368-637461726353"
2929
Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
30+
unzip_jll = "88f77b66-78eb-5ed0-bc16-ebba0796830d"
3031

3132
[weakdeps]
3233
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
3334
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
3435
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
36+
DLFP8Types = "f4c16678-4a16-415b-82ef-ed337c5d6c7c"
37+
Float8s = "81dfefd7-55b0-40c6-a251-db853704e186"
38+
GPUCompiler = "61eb1bfa-7361-4325-ad38-22787b887f55"
3539
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
3640
MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
3741
NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
@@ -50,6 +54,8 @@ ReactantCore = {path = "lib/ReactantCore"}
5054
ReactantAbstractFFTsExt = "AbstractFFTs"
5155
ReactantArrayInterfaceExt = "ArrayInterface"
5256
ReactantCUDAExt = ["CUDA", "GPUCompiler", "KernelAbstractions", "LLVM"]
57+
ReactantDLFP8TypesExt = "DLFP8Types"
58+
ReactantFloat8sExt = "Float8s"
5359
ReactantKernelAbstractionsExt = "KernelAbstractions"
5460
ReactantMPIExt = "MPI"
5561
ReactantNNlibExt = ["NNlib", "Statistics"]
@@ -67,10 +73,12 @@ Adapt = "4.1"
6773
ArrayInterface = "7.17.1"
6874
CEnum = "0.5"
6975
CUDA = "5.6"
76+
DLFP8Types = "0.1"
7077
Downloads = "1.6"
7178
EnumX = "1"
7279
Enzyme = "0.13.49"
7380
EnzymeCore = "0.8.11"
81+
Float8s = "0.1"
7482
Functors = "0.5"
7583
GPUArraysCore = "0.2"
7684
GPUCompiler = "1.3"
@@ -90,13 +98,14 @@ PythonCall = "0.9.25"
9098
Random = "1.10"
9199
Random123 = "1.7"
92100
ReactantCore = "0.1.15"
93-
Reactant_jll = "0.0.216"
101+
Reactant_jll = "0.0.224"
94102
ScopedValues = "1.3.0"
95103
Scratch = "1.2"
96104
Sockets = "1.10"
97105
SpecialFunctions = "2.4"
98106
Statistics = "1.10"
99-
YaoBlocks = "0.13"
107+
unzip_jll = "6"
108+
YaoBlocks = "0.13, 0.14"
100109
julia = "1.10"
101110

102111
[extras]

deps/ReactantExtra/.bazelrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ build --announce_rc
22

33
# TODO: Migrate for https://github.com/bazelbuild/bazel/issues/7260
44
common --noincompatible_enable_cc_toolchain_resolution
5+
common --repo_env USE_HERMETIC_CC_TOOLCHAIN=0
56
common --experimental_repo_remote_exec
67
common --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
78
common --cxxopt=-w --host_cxxopt=-w
89
common --define=grpc_no_ares=true
910
common --noenable_bzlmod
1011

12+
1113
build --repo_env=USE_PYWRAP_RULES=True
1214
build --copt=-DGRPC_BAZEL_BUILD
1315
build --host_copt=-DGRPC_BAZEL_BUILD
@@ -27,6 +29,7 @@ build:cuda --repo_env TF_NVCC_CLANG=1
2729
build:cuda --repo_env TF_NCCL_USE_STUB=1
2830
build:cuda --repo_env=HERMETIC_CUDA_VERSION="12.8.1"
2931
build:cuda --repo_env=HERMETIC_CUDNN_VERSION="9.8.0"
32+
build:cuda --repo_env=HERMETIC_NVSHMEM_VERSION="3.2.5"
3033
# "sm" means we emit only cubin, which is forward compatible within a GPU generation.
3134
# "compute" means we emit both cubin and PTX, which is larger but also forward compatible to future GPU generations.
3235
build:cuda --repo_env HERMETIC_CUDA_COMPUTE_CAPABILITIES="sm_60,sm_70,sm_80,compute_90"
@@ -35,6 +38,8 @@ build:cuda --@local_config_cuda//:enable_cuda
3538
# Default hermetic CUDA and CUDNN versions.
3639
build:cuda --@local_config_cuda//cuda:include_cuda_libs=true
3740
build:cuda --@local_config_cuda//:cuda_compiler=nvcc
41+
# build:cuda --@local_config_nvshmem//:override_include_nvshmem_libs=true
42+
# build:cuda --@local_config_nvshmem//cuda:include_nvshmem_libs=true
3843

3944
build:rocm --repo_env TF_NEED_ROCM=1
4045
build:rocm --define=using_rocm=true

0 commit comments

Comments
 (0)