Fixed all testcases

test/CMakeLists.txt

@@ -74,11 +74,6 @@ if(UNIX AND NOT APPLE)
 ion_jit(port-access SRCS port-access.cc)
 add_dependencies(port-access  ion-bb-test)
 ion_register_test(port-access_test port-access)
-
-# PortMap index access
-ion_jit(portmap-access SRCS portmap-access.cc)
-add_dependencies(portmap-access  ion-bb-test)
-ion_register_test(portmap-access_test portmap-access)
 endif()
 
 ion_jit(direct-extern SRCS direct-extern.cc)

test/array_output.cc

@@ -12,37 +12,37 @@ int main() {
     try {
         constexpr size_t h = 12, w = 10, len = 5;
 
-        Port input{"input", Halide::type_of<int32_t>(), 2};
-        Builder b;
-        b.set_target(Halide::get_host_target());
-        Node n;
-        n = b.add("test_array_output")(input).set_param(Param{"len", std::to_string(len)});
-        n = b.add("test_array_copy")(n["array_output"]).set_param(Param{"len", std::to_string(len)});
-
-        Halide::Buffer<int32_t> in(w, h);
+        ion::Buffer<int32_t> in(w, h);
         for (int y = 0; y < h; ++y) {
             for (int x = 0; x < w; ++x) {
                 in(x, y) = y * w + x;
             }
         }
 
-        std::vector<Halide::Buffer<int32_t>> outs{
-            Halide::Buffer<int32_t>{w, h},
-            Halide::Buffer<int32_t>{w, h},
-            Halide::Buffer<int32_t>{w, h},
-            Halide::Buffer<int32_t>{w, h},
-            Halide::Buffer<int32_t>{w, h}
+        std::vector<ion::Buffer<int32_t>> outs{
+            ion::Buffer<int32_t>{w, h},
+            ion::Buffer<int32_t>{w, h},
+            ion::Buffer<int32_t>{w, h},
+            ion::Buffer<int32_t>{w, h},
+            ion::Buffer<int32_t>{w, h}
         };
+
         for (auto &b : outs) {
             b.fill(0);
         }
 
-        PortMap pm;
-        pm.set(input, in);
+        Builder b;
+        b.set_target(ion::get_host_target());
+
+        Node n;
+        n = b.add("test_array_output")(in).set_param(Param("len", len));
+        n = b.add("test_array_copy")(n["array_output"]).set_param(Param("len", len));
+
         for (size_t i=0; i<len; ++i) {
-            pm.set(n["array_output"][i], outs[i]);
+            n["array_output"][i].bind(outs[i]);
         }
-        b.run(pm);
+
+        b.run();
 
         for (auto &b : outs) {
             if (b.dimensions() != 2) {

test/dup.cc

@@ -8,24 +8,24 @@ using namespace ion;
 int main()
 {
     try {
-        Param v41{"v", "41"};
+        Param v41("v", 41);
+
         Builder b;
-        b.set_target(Halide::get_host_target());
+        b.set_target(ion::get_host_target());
         Node n;
         n = b.add("test_producer").set_param(v41);
         Port intm = n["output"];
         n = b.add("test_inc_i32x2")(n["output"]);
 
-        PortMap pm;
-        Halide::Buffer<int32_t> outBuf0(std::vector<int32_t>{1, 1});
+        ion::Buffer<int32_t> outBuf0(std::vector<int32_t>{1, 1});
         outBuf0(0, 0) = 0;
-        pm.set(n["output"], outBuf0);
-        Halide::Buffer<int32_t> outBuf1(std::vector<int32_t>{1, 1});
+        n["output"].bind(outBuf0);
+        ion::Buffer<int32_t> outBuf1(std::vector<int32_t>{1, 1});
         outBuf1(0, 0) = 1;
-        pm.set(intm, outBuf1);
+        intm.bind(outBuf1);
 
         for (int i=0; i<10; ++i) {
-            b.run(pm);
+            b.run();
             if (outBuf0(0, 0) != outBuf1(0, 0)) {
                 std::cout << "o0:" << outBuf0(0, 0) << std::endl;
                 std::cout << "o1:" << outBuf1(0, 0) << std::endl;

test/port-access.cc

@@ -35,12 +35,11 @@ void display_image_float(Halide::Buffer<float> buffer, std::string filename) {
 
 int main(int argc, char *argv[]) {
     try {
-        // TODO: Test with FullHD
-        const int width = 200;
-        const int height = 150;
+        int width = 200;
+        int height = 150;
 
-        Param wparam("width", std::to_string(width));
-        Param hparam("height", std::to_string(height));
+        Param wparam("width", width);
+        Param hparam("height", height);
 
         Port wport("width", Halide::type_of<int32_t>());
         Port hport("height", Halide::type_of<int32_t>());
@@ -53,25 +52,20 @@ int main(int argc, char *argv[]) {
         n = b.add("image_io_cameraN").set_param(
                 wparam,
                 hparam,
-                Param{"num_devices", "2"},
-                Param{"urls", "http://optipng.sourceforge.net/pngtech/img/lena.png;http://upload.wikimedia.org/wikipedia/commons/0/05/Cat.png"}
-                //input urls split by ';'
+                Param("num_devices", 2),
+                Param("urls", "http://optipng.sourceforge.net/pngtech/img/lena.png;http://upload.wikimedia.org/wikipedia/commons/0/05/Cat.png")
         );
         n = b.add("base_normalize_3d_uint8")(n["output"][1]);  // access only port[1]
         n = b.add("image_processing_resize_nearest_3d")(n["output"]).set_param(
-                Param{"width", std::to_string(width)},
-                Param{"height", std::to_string(height)},
-                Param{"scale", std::to_string(2)});
+                Param("width", width),
+                Param("height", height),
+                Param("scale", 2));
         Port output = n["output"];
 
-        PortMap pm;
-
-        pm.set(wport, width);
-        pm.set(hport, height);
         Halide::Buffer<float> out_buf( width, height,3);
-        pm.set(output, out_buf);
+        output.bind(out_buf);
 
-        b.run(pm);
+        b.run();
         display_image_float(out_buf, "display.png");
         std::cout << "Success" << std::endl;
     } catch (const Halide::Error &e) {