Skip to content

Commit e40251b

Browse files
committed
Merge remote-tracking branch 'origin/main' into rebranch
2 parents e42d4db + aba448e commit e40251b

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

benchmark/single-source/SIMDReduceInteger.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ let int32Data: UnsafeBufferPointer<Int32> = {
8585
let untyped = UnsafeMutableRawBufferPointer.allocate(
8686
byteCount: MemoryLayout<Int32>.size * count, alignment: 16
8787
)
88-
// Intialize the memory as Int32 and fill with random values.
88+
// Initialize the memory as Int32 and fill with random values.
8989
let typed = untyped.initializeMemory(as: Int32.self, repeating: 0)
9090
var g = SplitMix64(seed: 0)
9191
for i in 0 ..< typed.count {
@@ -172,7 +172,7 @@ let int8Data: UnsafeBufferPointer<Int8> = {
172172
let untyped = UnsafeMutableRawBufferPointer.allocate(
173173
byteCount: MemoryLayout<Int8>.size * count, alignment: 16
174174
)
175-
// Intialize the memory as Int8 and fill with random values.
175+
// Initialize the memory as Int8 and fill with random values.
176176
let typed = untyped.initializeMemory(as: Int8.self, repeating: 0)
177177
var g = SplitMix64(seed: 0)
178178
for i in 0 ..< typed.count {

utils/update_checkout/update_checkout/update_checkout.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,18 @@ def update_single_repository(pool_args):
156156
if checkout_target:
157157
shell.run(['git', 'status', '--porcelain', '-uno'],
158158
echo=False)
159+
160+
# Some of the projects switch branches/tags when they
161+
# are updated. Local checkout might not have that tag/branch
162+
# fetched yet, so let's attempt to fetch before attempting
163+
# checkout.
164+
try:
165+
shell.run(['git', 'rev-parse', '--verify', checkout_target])
166+
except Exception:
167+
shell.run(["git", "fetch", "--recurse-submodules=yes",
168+
"--tags"],
169+
echo=True)
170+
159171
try:
160172
shell.run(['git', 'checkout', checkout_target], echo=True)
161173
except Exception as originalException:

0 commit comments

Comments
 (0)