Skip to content

Commit

Permalink
bump dendrite, softnpu, and sidecar-lite versions to get full multipa…
Browse files Browse the repository at this point in the history
…th (#4637)
  • Loading branch information
Nieuwejaar authored Dec 7, 2023
1 parent 75cd901 commit 75cdeeb
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions package-manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,8 @@ only_for_targets.image = "standard"
# 2. Copy dendrite.tar.gz from dendrite/out to omicron/out
source.type = "prebuilt"
source.repo = "dendrite"
source.commit = "1b15e62b04044ef2b15c82d8dcef03f6fc24b3d8"
source.sha256 = "06b5eeedaebf30e96a5c5e932e08034c90947af7a54e9bc04d57d6807013ade9"
source.commit = "45e05b2a90203d84510e0c8e902d9449b09ffd9b"
source.sha256 = "b14e73c8091a004472f9825b9b81b2c685bc5a48801704380a80481499060ad9"
output.type = "zone"
output.intermediate_only = true

Expand All @@ -501,8 +501,8 @@ only_for_targets.image = "standard"
# 2. Copy the output zone image from dendrite/out to omicron/out
source.type = "prebuilt"
source.repo = "dendrite"
source.commit = "1b15e62b04044ef2b15c82d8dcef03f6fc24b3d8"
source.sha256 = "51be0b0342bc7cdf927797af45af3bc82861bb8efb174d50958cb16b5620c51d"
source.commit = "45e05b2a90203d84510e0c8e902d9449b09ffd9b"
source.sha256 = "06575bea6173d16f6d206b580956ae2cdc72c65df2eb2f40dac01468ab49e336"
output.type = "zone"
output.intermediate_only = true

Expand All @@ -519,8 +519,8 @@ only_for_targets.image = "standard"
# 2. Copy dendrite.tar.gz from dendrite/out to omicron/out/dendrite-softnpu.tar.gz
source.type = "prebuilt"
source.repo = "dendrite"
source.commit = "1b15e62b04044ef2b15c82d8dcef03f6fc24b3d8"
source.sha256 = "9afb24cdae27755eaf86a856268686bb641048b5d450dae858cf47b9daaa46ed"
source.commit = "45e05b2a90203d84510e0c8e902d9449b09ffd9b"
source.sha256 = "db2a398426fe59bd911eed91a3db7731a7a4d57e31dd357d89828d04b0891e2a"
output.type = "zone"
output.intermediate_only = true

Expand Down
2 changes: 1 addition & 1 deletion tools/ci_download_softnpu_machinery
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ OUT_DIR="out/npuzone"

# Pinned commit for softnpu ASIC simulator
SOFTNPU_REPO="softnpu"
SOFTNPU_COMMIT="dec63e67156fe6e958991bbfa090629868115ab5"
SOFTNPU_COMMIT="dbab082dfa89da5db5ca2325c257089d2f130092"

# This is the softnpu ASIC simulator
echo "fetching npuzone"
Expand Down
4 changes: 2 additions & 2 deletions tools/create_virtual_hardware.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ function ensure_softnpu_zone {
--omicron-zone \
--ports sc0_0,tfportrear0_0 \
--ports sc0_1,tfportqsfp0_0 \
--sidecar-lite-commit f0585a29fb0285f7a1220c1118856b0e5c1f75c5 \
--softnpu-commit dec63e67156fe6e958991bbfa090629868115ab5
--sidecar-lite-commit 45ed98fea5824feb4d42f45bbf218e597dc9fc58 \
--softnpu-commit dbab082dfa89da5db5ca2325c257089d2f130092
}
"$SOURCE_DIR"/scrimlet/softnpu-init.sh
success "softnpu zone exists"
Expand Down
2 changes: 1 addition & 1 deletion tools/dendrite_openapi_version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
COMMIT="1b15e62b04044ef2b15c82d8dcef03f6fc24b3d8"
COMMIT="45e05b2a90203d84510e0c8e902d9449b09ffd9b"
SHA2="07d115bfa8498a8015ca2a8447efeeac32e24aeb25baf3d5e2313216e11293c0"
6 changes: 3 additions & 3 deletions tools/dendrite_stub_checksums
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CIDL_SHA256_ILLUMOS="06b5eeedaebf30e96a5c5e932e08034c90947af7a54e9bc04d57d6807013ade9"
CIDL_SHA256_LINUX_DPD="99a800cbd5739245154831004892d47be5a871e37c536ec3009911ddb02fdb16"
CIDL_SHA256_LINUX_SWADM="e92bfc071f3944523a2e69b13ee877a4fd87cb8a9a78011b4aa8f40218347e25"
CIDL_SHA256_ILLUMOS="b14e73c8091a004472f9825b9b81b2c685bc5a48801704380a80481499060ad9"
CIDL_SHA256_LINUX_DPD="a0d92b5007826b119c68fdaef753e33b125740ec7b3e771bfa6b3aa8d9fcb8cc"
CIDL_SHA256_LINUX_SWADM="13387460db5b57e6ffad6c0b8877af32cc6d53fecc4a1a0910143c0446d39a38"

0 comments on commit 75cdeeb

Please sign in to comment.