Update onnx app to Adams2019 autoscheduler and new autoscheduler API

Fixes #7670
halide · Jul 10, 2023 · 3157885 · 3157885
1 parent 9755e3d
commit 3157885
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/apps/onnx/Makefile b/apps/onnx/Makefile
@@ -88,7 +88,7 @@ PYCXXFLAGS =  $(CXXFLAGS) $(PYBIND11_CFLAGS) -Wno-deprecated-register
 
 # Python extension for HalideModel
 $(BIN)/%/$(PY_MODEL_EXT): model.cpp $(BIN)/%/oclib.a
-	$(CXX) $(PYCXXFLAGS) -Wall -shared -fPIC -I$(BIN)/$* $^ $(LIBHALIDE_LDFLAGS) -o $@ $(LDFLAGS)
+	$(CXX) $(PYCXXFLAGS) -Wall -shared -fPIC -I$(BIN)/$* $^ $(LIBHALIDE_LDFLAGS) -Wl,--no-as-needed -lautoschedule_adams2019 -Wl,--as-needed -o $@ $(LDFLAGS)
 
 
 model_test: $(BIN)/$(HL_TARGET)/$(PY_MODEL_EXT)

diff --git a/apps/onnx/model.cpp b/apps/onnx/model.cpp
@@ -65,7 +65,8 @@ HalideModel convert_onnx_model(
 std::string auto_schedule(const HalideModel &pipeline) {
     // Generate a schedule for the pipeline.
     Halide::Target tgt = Halide::get_host_target();
-    auto schedule = pipeline.rep->auto_schedule(tgt);
+    Halide::AutoschedulerParams autoscheduler_params = Halide::AutoschedulerParams("Adams2019");
+    auto schedule = pipeline.rep->apply_autoscheduler(tgt, autoscheduler_params);
     return schedule.schedule_source;
 }
 

diff --git a/apps/onnx/model_test.py b/apps/onnx/model_test.py
@@ -35,10 +35,10 @@ def test_small_model(self):
         model.BuildFromOnnxModel(onnx_model)
         schedule = model.OptimizeSchedule()
         schedule = schedule.replace('\n', ' ')
-        expected_schedule = r'// --- BEGIN machine-generated schedule // Target: .+// MachineParams: .+// Delete this line if not using Generator Pipeline pipeline = get_pipeline\(\);.+Func OUT = pipeline.get_func\(1\);.+{.+}.+'
+        expected_schedule = r'.*Func OUT = pipeline.get_func\(1\);.+'
         self.assertRegex(schedule, expected_schedule)
 
-        input = np.random.rand(2, 3) - 0.5
+        input = (np.random.rand(2, 3) - 0.5).astype('float32')
         outputs = model.run([input])
         self.assertEqual(1, len(outputs))
         output = outputs[0]
@@ -62,12 +62,12 @@ def test_scalars(self):
         model = Model()
         model.BuildFromOnnxModel(onnx_model)
         schedule = model.OptimizeSchedule()
-        schedule = schedule.replace('\n', ' ')
-        expected_schedule = r'// --- BEGIN machine-generated schedule // Target: .+// MachineParams: .+// Delete this line if not using Generator Pipeline pipeline = get_pipeline\(\);.+Func C = pipeline.get_func\(2\);.+{.+}.+'
+        schedule = schedule.replace('\n', ' ')        
+        expected_schedule = r'.*Func C = pipeline.get_func\(2\);.+'
         self.assertRegex(schedule, expected_schedule)
 
-        input1 = np.random.randint(-10, 10, size=())
-        input2 = np.random.randint(-10, 10, size=())
+        input1 = np.random.randint(-10, 10, size=()).astype('int32')
+        input2 = np.random.randint(-10, 10, size=()).astype('int32')
         outputs = model.run([input1, input2])
         self.assertEqual(1, len(outputs))
         output = outputs[0]