Skip to content

Commit c19dc4d

Browse files
hyperpolymathhyperpolymath
committed
chore: M5 CI/Workflow Sweep - final synchronisation
1 parent 4c5e2a0 commit c19dc4d

4 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎src/codegen/build_gen.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ mod tests {
244244
FutharkType::F32,
245245
FutharkType::F32,
246246
)];
247-
let header = generate_c_header(&manifest, &kernels).unwrap();
247+
let header = generate_c_header(&manifest, &kernels).expect("TODO: handle error");
248248
assert!(header.contains("#ifndef TEST_PROJECT_H"));
249249
assert!(header.contains("#define TEST_PROJECT_H"));
250250
assert!(header.contains("#include <stdint.h>"));
@@ -257,23 +257,23 @@ mod tests {
257257
let manifest = test_manifest();
258258
let mut kernel = make_kernel("sum", SOAC::Reduce, FutharkType::F64, FutharkType::F64);
259259
kernel.operator = Some("+".to_string());
260-
let header = generate_c_header(&manifest, &[kernel]).unwrap();
260+
let header = generate_c_header(&manifest, &[kernel]).expect("TODO: handle error");
261261
assert!(header.contains("double *out"));
262262
}
263263

264264
#[test]
265265
fn test_c_header_scatter_has_three_args() {
266266
let manifest = test_manifest();
267267
let kernel = make_kernel("write", SOAC::Scatter, FutharkType::F32, FutharkType::F32);
268-
let header = generate_c_header(&manifest, &[kernel]).unwrap();
268+
let header = generate_c_header(&manifest, &[kernel]).expect("TODO: handle error");
269269
assert!(header.contains("dest"));
270270
assert!(header.contains("futhark_i64_1d *is"));
271271
}
272272

273273
#[test]
274274
fn test_build_script_contains_backend() {
275275
let manifest = test_manifest();
276-
let script = generate_build_script(&manifest, Path::new("test-project.fut")).unwrap();
276+
let script = generate_build_script(&manifest, Path::new("test-project.fut")).expect("TODO: handle error");
277277
assert!(script.contains("futhark opencl test-project.fut"));
278278
assert!(!script.contains("autotune"));
279279
}
@@ -282,14 +282,14 @@ mod tests {
282282
fn test_build_script_with_tuning() {
283283
let mut manifest = test_manifest();
284284
manifest.gpu.tuning = true;
285-
let script = generate_build_script(&manifest, Path::new("test-project.fut")).unwrap();
285+
let script = generate_build_script(&manifest, Path::new("test-project.fut")).expect("TODO: handle error");
286286
assert!(script.contains("futhark autotune"));
287287
}
288288

289289
#[test]
290290
fn test_build_script_checks_futhark_installed() {
291291
let manifest = test_manifest();
292-
let script = generate_build_script(&manifest, Path::new("test.fut")).unwrap();
292+
let script = generate_build_script(&manifest, Path::new("test.fut")).expect("TODO: handle error");
293293
assert!(script.contains("command -v futhark"));
294294
}
295295
}

‎src/codegen/futhark_gen.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ mod tests {
280280
FutharkType::F32,
281281
FutharkType::F32,
282282
)];
283-
let source = generate_futhark_source(&manifest, &kernels).unwrap();
283+
let source = generate_futhark_source(&manifest, &kernels).expect("TODO: handle error");
284284
assert!(source.contains("Auto-generated by futharkiser"));
285285
assert!(source.contains("entry k1"));
286286
assert!(source.contains("PMPL-1.0-or-later"));
@@ -298,7 +298,7 @@ mod tests {
298298
fn test_description_becomes_comment() {
299299
let mut kernel = make_kernel("blur", SOAC::Map, FutharkType::F32, FutharkType::F32);
300300
kernel.description = "Gaussian blur".to_string();
301-
let code = generate_kernel_entry(&kernel).unwrap();
301+
let code = generate_kernel_entry(&kernel).expect("TODO: handle error");
302302
assert!(code.contains("-- | Gaussian blur"));
303303
}
304304
}

‎src/codegen/parser.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ mod tests {
9393
#[test]
9494
fn test_parse_map_kernel() {
9595
let raw = raw_kernel("blur", "map", "[f32]", "[f32]");
96-
let kc = parse_single_kernel(&raw).unwrap();
96+
let kc = parse_single_kernel(&raw).expect("TODO: handle error");
9797
assert_eq!(kc.pattern, SOAC::Map);
9898
assert_eq!(kc.input_type, FutharkType::F32);
9999
assert_eq!(kc.output_type, FutharkType::F32);
@@ -103,7 +103,7 @@ mod tests {
103103
fn test_parse_reduce_kernel() {
104104
let mut raw = raw_kernel("sum", "reduce", "[f64]", "[f64]");
105105
raw.operator = Some("+".to_string());
106-
let kc = parse_single_kernel(&raw).unwrap();
106+
let kc = parse_single_kernel(&raw).expect("TODO: handle error");
107107
assert_eq!(kc.pattern, SOAC::Reduce);
108108
assert_eq!(kc.operator, Some("+".to_string()));
109109
}
@@ -112,22 +112,22 @@ mod tests {
112112
fn test_parse_scan_kernel() {
113113
let mut raw = raw_kernel("prefix", "scan", "[i32]", "[i32]");
114114
raw.operator = Some("+".to_string());
115-
let kc = parse_single_kernel(&raw).unwrap();
115+
let kc = parse_single_kernel(&raw).expect("TODO: handle error");
116116
assert_eq!(kc.pattern, SOAC::Scan);
117117
}
118118

119119
#[test]
120120
fn test_parse_scatter_kernel() {
121121
let raw = raw_kernel("write", "scatter", "[f32]", "[f32]");
122-
let kc = parse_single_kernel(&raw).unwrap();
122+
let kc = parse_single_kernel(&raw).expect("TODO: handle error");
123123
assert_eq!(kc.pattern, SOAC::Scatter);
124124
}
125125

126126
#[test]
127127
fn test_parse_histogram_kernel() {
128128
let mut raw = raw_kernel("hist", "histogram", "[u8]", "[i64]");
129129
raw.bins = Some(256);
130-
let kc = parse_single_kernel(&raw).unwrap();
130+
let kc = parse_single_kernel(&raw).expect("TODO: handle error");
131131
assert_eq!(kc.pattern, SOAC::Histogram);
132132
assert_eq!(kc.bins, Some(256));
133133
}

‎src/manifest/mod.rs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ backend = "c"
362362

363363
#[test]
364364
fn test_parse_minimal_manifest() {
365-
let m: Manifest = toml::from_str(&minimal_toml()).unwrap();
365+
let m: Manifest = toml::from_str(&minimal_toml()).expect("TODO: handle error");
366366
assert_eq!(m.project.name, "test");
367367
assert_eq!(m.kernels.len(), 1);
368368
assert_eq!(m.kernels[0].name, "k1");
@@ -371,7 +371,7 @@ backend = "c"
371371

372372
#[test]
373373
fn test_validate_minimal() {
374-
let m: Manifest = toml::from_str(&minimal_toml()).unwrap();
374+
let m: Manifest = toml::from_str(&minimal_toml()).expect("TODO: handle error");
375375
validate(&m).expect("minimal manifest should be valid");
376376
}
377377

@@ -386,7 +386,7 @@ pattern = "map"
386386
input-type = "[f32]"
387387
output-type = "[f32]"
388388
"#;
389-
let m: Manifest = toml::from_str(toml_str).unwrap();
389+
let m: Manifest = toml::from_str(toml_str).expect("TODO: handle error");
390390
assert!(validate(&m).is_err());
391391
}
392392

@@ -401,7 +401,7 @@ pattern = "reduce"
401401
input-type = "[f64]"
402402
output-type = "[f64]"
403403
"#;
404-
let m: Manifest = toml::from_str(toml_str).unwrap();
404+
let m: Manifest = toml::from_str(toml_str).expect("TODO: handle error");
405405
let err = validate(&m).unwrap_err();
406406
assert!(err.to_string().contains("operator"));
407407
}
@@ -417,7 +417,7 @@ pattern = "histogram"
417417
input-type = "[u8]"
418418
output-type = "[i64]"
419419
"#;
420-
let m: Manifest = toml::from_str(toml_str).unwrap();
420+
let m: Manifest = toml::from_str(toml_str).expect("TODO: handle error");
421421
let err = validate(&m).unwrap_err();
422422
assert!(err.to_string().contains("bins"));
423423
}
@@ -433,7 +433,7 @@ pattern = "flatmap"
433433
input-type = "[f32]"
434434
output-type = "[f32]"
435435
"#;
436-
let m: Manifest = toml::from_str(toml_str).unwrap();
436+
let m: Manifest = toml::from_str(toml_str).expect("TODO: handle error");
437437
assert!(validate(&m).is_err());
438438
}
439439

@@ -448,7 +448,7 @@ pattern = "map"
448448
input-type = "[string]"
449449
output-type = "[f32]"
450450
"#;
451-
let m: Manifest = toml::from_str(toml_str).unwrap();
451+
let m: Manifest = toml::from_str(toml_str).expect("TODO: handle error");
452452
assert!(validate(&m).is_err());
453453
}
454454

@@ -468,7 +468,7 @@ pattern = "map"
468468
input-type = "[i32]"
469469
output-type = "[i32]"
470470
"#;
471-
let m: Manifest = toml::from_str(toml_str).unwrap();
471+
let m: Manifest = toml::from_str(toml_str).expect("TODO: handle error");
472472
let err = validate(&m).unwrap_err();
473473
assert!(err.to_string().contains("duplicate"));
474474
}
@@ -491,8 +491,8 @@ input-type = "[f64]"
491491
output-type = "[f64]"
492492
operator = "+"
493493
"#;
494-
let m: Manifest = toml::from_str(toml_str).unwrap();
495-
let kernels = parse_kernels(&m).unwrap();
494+
let m: Manifest = toml::from_str(toml_str).expect("TODO: handle error");
495+
let kernels = parse_kernels(&m).expect("TODO: handle error");
496496
assert_eq!(kernels.len(), 2);
497497
assert_eq!(kernels[0].pattern, SOAC::Map);
498498
assert_eq!(kernels[0].input_type, FutharkType::F32);
@@ -502,20 +502,20 @@ operator = "+"
502502

503503
#[test]
504504
fn test_parse_all_backends() {
505-
assert_eq!(parse_backend("opencl").unwrap(), GPUBackend::OpenCL);
506-
assert_eq!(parse_backend("cuda").unwrap(), GPUBackend::CUDA);
507-
assert_eq!(parse_backend("multicore").unwrap(), GPUBackend::Multicore);
508-
assert_eq!(parse_backend("c").unwrap(), GPUBackend::C);
505+
assert_eq!(parse_backend("opencl").expect("TODO: handle error"), GPUBackend::OpenCL);
506+
assert_eq!(parse_backend("cuda").expect("TODO: handle error"), GPUBackend::CUDA);
507+
assert_eq!(parse_backend("multicore").expect("TODO: handle error"), GPUBackend::Multicore);
508+
assert_eq!(parse_backend("c").expect("TODO: handle error"), GPUBackend::C);
509509
assert!(parse_backend("vulkan").is_err());
510510
}
511511

512512
#[test]
513513
fn test_parse_all_patterns() {
514-
assert_eq!(parse_pattern("map").unwrap(), SOAC::Map);
515-
assert_eq!(parse_pattern("reduce").unwrap(), SOAC::Reduce);
516-
assert_eq!(parse_pattern("scan").unwrap(), SOAC::Scan);
517-
assert_eq!(parse_pattern("scatter").unwrap(), SOAC::Scatter);
518-
assert_eq!(parse_pattern("histogram").unwrap(), SOAC::Histogram);
514+
assert_eq!(parse_pattern("map").expect("TODO: handle error"), SOAC::Map);
515+
assert_eq!(parse_pattern("reduce").expect("TODO: handle error"), SOAC::Reduce);
516+
assert_eq!(parse_pattern("scan").expect("TODO: handle error"), SOAC::Scan);
517+
assert_eq!(parse_pattern("scatter").expect("TODO: handle error"), SOAC::Scatter);
518+
assert_eq!(parse_pattern("histogram").expect("TODO: handle error"), SOAC::Histogram);
519519
}
520520

521521
#[test]
@@ -529,7 +529,7 @@ pattern = "map"
529529
input-type = "[f32]"
530530
output-type = "[f32]"
531531
"#;
532-
let m: Manifest = toml::from_str(toml_str).unwrap();
532+
let m: Manifest = toml::from_str(toml_str).expect("TODO: handle error");
533533
assert_eq!(m.gpu.backend, "opencl");
534534
assert!(!m.gpu.tuning);
535535
}

0 commit comments

Comments
 (0)