Skip to content

Commit 299221f

Browse files
authored
Merge branch 'main' into olupton/nccl-test-base-container
2 parents adc2b04 + e0d81c9 commit 299221f

28 files changed

+460
-6249
lines changed

.github/container/Dockerfile.pax

Lines changed: 0 additions & 153 deletions
This file was deleted.

.github/container/build-jax.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ print_var() {
1111
supported_compute_capabilities() {
1212
ARCH=$1
1313
if [[ "${ARCH}" == "amd64" ]]; then
14-
echo "5.2,6.0,6.1,7.0,7.5,8.0,8.6,8.9,9.0,9.0a"
14+
echo "sm_75,sm_80,sm_86,sm_90,sm_100,compute_120"
1515
elif [[ "${ARCH}" == "arm64" ]]; then
16-
echo "5.3,6.2,7.0,7.2,7.5,8.0,8.6,8.7,8.9,9.0,9.0a"
16+
echo "sm_80,sm_86,sm_90,sm_100,compute_120"
1717
else
1818
echo "Invalid arch '$ARCH' (expected 'amd64' or 'arm64')" 1>&2
1919
return 1

.github/container/create-distribution.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Usage: $0 [OPTION]...
1515
-h, --help Print usage.
1616
-m, --manifest=PATH Path to the manifest. Updates it in-place
1717
-o, --override_dir=PATH Use this if there is a custom location of the upstream clone. If not specified, uses /opt/\${PACKAGE}
18-
-p, --package=KEY The package name in the manifest to use, e.g., t5x, paxml
18+
-p, --package=KEY The package name in the manifest to use, e.g., t5x
1919
-s, --skip-apply If provided, will only create patches, update manifest, and skip applying. When not provided, applies local patches.
2020
2121
--------------

.github/container/manifest.yaml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,43 +32,14 @@ t5x:
3232
mirror/patch/dali-support: file://patches/t5x/mirror-patch-dali-support.patch # pull/1393/head # https://github.com/google-research/t5x/pull/1393: Adds DALI support to t5x
3333
mirror/patch/t5x_te_in_contrib_noindent: file://patches/t5x/mirror-patch-t5x_te_in_contrib_noindent.patch # pull/1391/head # https://github.com/google-research/t5x/pull/1391: Adds transformer engine support and GPU optimizations to T5x (enables H100)
3434
mirror/patch/fix-default-vocab: file://patches/t5x/mirror-patch-fix-default-vocab.patch # pull/1609/head # https://github.com/google-research/t5x/pull/1609: Fixes seqio vocab mismatch
35-
paxml:
36-
url: https://github.com/google/paxml.git
37-
mirror_url: https://github.com/nvjax-svc-0/paxml.git
38-
tracking_ref: main
39-
latest_verified_commit: 051795784f8ddaba57eb51218addb5f1db8e04f4
40-
mode: git-clone
41-
patches:
42-
pull/46/head: file://patches/paxml/PR-46.patch # adds Transformer Engine support
43-
pull/93/head: file://patches/paxml/PR-93.patch # exposes TE DPA argument in Grok to make it configurable from the command line
44-
mirror/patch/validation-configs: file://patches/paxml/mirror-patch-validation-configs.patch # adds additional configs for testing
45-
mirror/patch/log-avg-loss: file://patches/paxml/mirror-patch-log-avg-loss.patch # logs average loss over last `n` steps
46-
mirror/patch/status-logging: file://patches/paxml/mirror-patch-status-logging.patch # sets log level of task status lines to warning
47-
praxis:
48-
url: https://github.com/google/praxis.git
49-
mirror_url: https://github.com/nvjax-svc-0/praxis.git
50-
tracking_ref: main
51-
latest_verified_commit: c58bcc4e82c80489a7f8a2c3366e7f6b32d271d4
52-
mode: git-clone
53-
patches:
54-
pull/27/head: file://patches/praxis/PR-27.patch # This PR allows XLA:GPU to detect the MHA pattern more easily to call fused kernels from cublas.
55-
pull/36/head: file://patches/praxis/PR-36.patch # adds Transformer Engine support
56-
pull/84/head: file://patches/praxis/PR-84.patch # experimental support for using TE FMHA in GQA
5735
lingvo:
58-
# Used only in ARM pax builds
5936
url: https://github.com/tensorflow/lingvo.git
6037
tracking_ref: master
6138
latest_verified_commit: 05a076b0783a8bbf4a770095966c472bb37bbf65
6239
mode: git-clone
6340
pydantic:
6441
version: X.Y.Z
6542
mode: pip-constraint
66-
# Used by praxis
67-
fiddle:
68-
url: https://github.com/google/fiddle.git
69-
tracking_ref: main
70-
latest_verified_commit: 2a17618c56eb99aa58aa898ae12cbac7cf5c3b30
71-
mode: pip-vcs
7243
# Used by t5x
7344
airio:
7445
url: https://github.com/google/airio.git

0 commit comments

Comments
 (0)