Examples: polished tutorial

examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-foreach(PROG simple)
+foreach(PROG indexing)
      add_executable(example-${PROG} ${PROG}.cpp)
      target_link_libraries(example-${PROG} isaac)
 endforeach(PROG)

examples/indexing.cpp

@@ -0,0 +1,45 @@
+#include "isaac/array.h"
+
+namespace sc = isaac;
+
+int main()
+{
+    static const char * sline = "--------------------";
+    static const char * dline = "====================";
+
+    std::cout << dline << std::endl;
+    std::cout << "Tutorial: Indexing " << std::endl;
+    std::cout << dline << std::endl;
+
+    sc::int_t M = 10, N = 7;
+
+    std::vector<float> data(M*N);
+    for(unsigned int i = 0 ; i < data.size(); ++i)
+      data[i] = i;
+    sc::array A = sc::array(M, N, data);
+
+    std::cout << "A:" << std::endl;
+    std::cout << sline << std::endl;
+    std::cout << A << std::endl;
+    std::cout << std::endl;
+
+    std::cout << "A[3, 2:end]:" << std::endl;
+    std::cout << sline << std::endl;
+    std::cout << A(3, {2,sc::end}) << std::endl;
+    std::cout << std::endl;
+
+    std::cout << "A[2:end, 4]:" << std::endl;
+    std::cout << sline << std::endl;
+    std::cout << A({2,sc::end}, 4) << std::endl;
+    std::cout << std::endl;
+
+    std::cout << "diag(A,  1): " << std::endl;
+    std::cout << sline << std::endl;
+    std::cout << sc::diag(A, 1) << std::endl;
+    std::cout << std::endl;
+
+    std::cout << "diag(A, -7): " << std::endl;
+    std::cout << sline << std::endl;
+    std::cout << sc::diag(A, -7) << std::endl;
+    std::cout << std::endl;
+}

examples/simple.cpp

@@ -1,19 +0,0 @@
-#include "isaac/array.h"
-
-namespace sc = isaac;
-
-int main()
-{
-
-    std::vector<float> data(70);
-    for(unsigned int i = 0 ; i < data.size(); ++i)
-      data[i] = i;
-    sc::array A = sc::array(10, 7, data);
-    std::cout << A << std::endl;
-    std::cout << sc::diag(A, 1) << std::endl;
-    std::cout << sc::diag(A, -1) << std::endl;
-    std::cout << sc::diag(A, -7) << std::endl;
-    std::cout << A(3, {2,sc::end}) << std::endl;
-    std::cout << A({2,sc::end}, 4) << std::endl;
-    std::cout << sc::row(A, 3) << std::endl;
-}

include/isaac/types.h

@@ -47,7 +47,5 @@ struct slice
   int_t stride;
 };
 
-
-
 }
 #endif

python/setup.py

@@ -73,7 +73,7 @@ def main():
       libraries += ['gnustl_shared']
 
     #Source files
-    src =  'src/lib/profiles/presets.cpp src/lib/profiles/profiles.cpp src/lib/profiles/predictors/random_forest.cpp src/lib/array.cpp src/lib/kernels/mapped_object.cpp src/lib/kernels/binder.cpp src/lib/kernels/parse.cpp src/lib/kernels/templates/gemm.cpp src/lib/kernels/templates/dot.cpp src/lib/kernels/templates/base.cpp src/lib/kernels/templates/ger.cpp src/lib/kernels/templates/axpy.cpp src/lib/kernels/templates/gemv.cpp src/lib/kernels/stream.cpp src/lib/kernels/keywords.cpp src/lib/value_scalar.cpp src/lib/wrap/clBLAS.cpp src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/driver/command_queue.cpp src/lib/driver/handle.cpp src/lib/driver/buffer.cpp src/lib/driver/event.cpp src/lib/driver/context.cpp src/lib/driver/program_cache.cpp src/lib/driver/ndrange.cpp src/lib/driver/check.cpp src/lib/driver/backend.cpp src/lib/driver/platform.cpp src/lib/driver/dispatch.cpp src/lib/driver/kernel.cpp src/lib/driver/device.cpp src/lib/driver/program.cpp src/lib/symbolic/preset.cpp src/lib/symbolic/expression.cpp src/lib/symbolic/execute.cpp src/lib/symbolic/io.cpp '.split() + [os.path.join('src', 'bind', sf)  for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'kernels.cpp', 'exceptions.cpp']]
+    src =  'src/lib/value_scalar.cpp src/lib/wrap/clBLAS.cpp src/lib/profiles/predictors/random_forest.cpp src/lib/profiles/profiles.cpp src/lib/profiles/presets.cpp src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/driver/handle.cpp src/lib/driver/dispatch.cpp src/lib/driver/event.cpp src/lib/driver/ndrange.cpp src/lib/driver/program_cache.cpp src/lib/driver/command_queue.cpp src/lib/driver/buffer.cpp src/lib/driver/backend.cpp src/lib/driver/platform.cpp src/lib/driver/program.cpp src/lib/driver/kernel.cpp src/lib/driver/device.cpp src/lib/driver/check.cpp src/lib/driver/context.cpp src/lib/symbolic/preset.cpp src/lib/symbolic/execute.cpp src/lib/symbolic/expression.cpp src/lib/symbolic/io.cpp src/lib/array.cpp src/lib/kernels/parse.cpp src/lib/kernels/templates/ger.cpp src/lib/kernels/templates/axpy.cpp src/lib/kernels/templates/gemm.cpp src/lib/kernels/templates/base.cpp src/lib/kernels/templates/gemv.cpp src/lib/kernels/templates/dot.cpp src/lib/kernels/binder.cpp src/lib/kernels/keywords.cpp src/lib/kernels/mapped_object.cpp src/lib/kernels/stream.cpp '.split() + [os.path.join('src', 'bind', sf)  for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'kernels.cpp', 'exceptions.cpp']]
     boostsrc = 'external/boost/libs/'
     for s in ['numpy','python','smart_ptr','system','thread']:
         src = src + [x for x in recursive_glob('external/boost/libs/' + s + '/src/','.cpp') if 'win32' not in x and 'pthread' not in x]