expand

Author: lgarithm

auto/cmake

@@ -0,0 +1,56 @@
+# -*- mode: sh -*-
+
+QUIET=0
+
+CMAKE_FLAGS=
+
+add_cmake_flag() {
+    if [ $QUIET -eq 0 ]; then
+        echo "Using $1=$2"
+    fi
+    CMAKE_FLAGS="${CMAKE_FLAGS} -D$1=$2"
+}
+
+pass_cmake_flag_from_env() {
+    local name=$1
+    local env_key=$2
+    if [ -z ${env_key} ]; then
+        env_key=$name
+    fi
+    local val=$(eval echo \$$env_key)
+    if [ ! -z "$val" ]; then
+        add_cmake_flag $name $val
+    fi
+}
+
+CMAKE_PREFIX_PATH=
+
+add_cmake_prefix() {
+    if [ $QUIET -eq 0 ]; then
+        echo "adding to CMAKE_PREFIX_PATH with $1"
+    fi
+    CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$1"
+}
+
+cleanup_cmake_cache() {
+    if [ -f CMakeCache.txt ]; then
+        rm CMakeCache.txt
+    fi
+    if [ -d 3rdparty ]; then
+        for cmake_cache in $(find 3rdparty/ | grep CMakeCache.txt); do
+            rm $cmake_cache
+        done
+    fi
+}
+
+get_dep() {
+    local name=$1
+    head -n 1 ./deps/$name | awk '{print $1}'
+}
+
+config_cmake() {
+    add_cmake_prefixes
+    add_cmake_flags
+    cleanup_cmake_cache
+    cmake . $CMAKE_FLAGS
+}

configure

@@ -52,6 +52,9 @@ parse_args() {
         --verbose)
             VERBOSE=1
             ;;
+        --quiet)
+            QUIET=1
+            ;;
         *)
             echo "unknown argument $i"
             exit 1
@@ -64,31 +67,7 @@ parse_args() {
     fi
 }
 
-CMAKE_FLAGS=
-
-add_cmake_flag() {
-    echo "Using $1=$2"
-    CMAKE_FLAGS="${CMAKE_FLAGS} -D$1=$2"
-}
-
-pass_cmake_flag_from_env() {
-    local name=$1
-    local env_key=$2
-    if [ -z ${env_key} ]; then
-        env_key=$name
-    fi
-    local val=$(eval echo \$$env_key)
-    if [ ! -z "$val" ]; then
-        add_cmake_flag $name $val
-    fi
-}
-
-CMAKE_PREFIX_PATH=
-
-add_cmake_prefix() {
-    echo "adding to CMAKE_PREFIX_PATH with $1"
-    CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$1"
-}
+. ./auto/cmake
 
 add_cmake_prefixes() {
     add_cmake_prefix $HOME/local
@@ -131,11 +110,7 @@ add_cmake_flags() {
 
 main() {
     parse_args $@
-    add_cmake_prefixes
-    add_cmake_flags
-
-    echo "Using CMAKE_FLAGS=${CMAKE_FLAGS}"
-    cmake . ${CMAKE_FLAGS}
+    config_cmake
 }
 
 main $@

include/ttl/bits/std_shape.hpp

@@ -60,6 +60,16 @@ class basic_shape
         return off;
     }
 
+    std::array<dim_t, r> expand(dim_t off) const
+    {
+        std::array<dim_t, r> coords;
+        for (rank_t i = r; i > 0; --i) {
+            coords[i - 1] = off % dims_[i - 1];
+            off /= dims_[i - 1];
+        }
+        return coords;
+    }
+
     template <rank_t p>
     dim_t coord(dim_t off) const
     {

tests/test_shape.cpp

@@ -16,6 +16,12 @@ void test_shape(dim_t h, dim_t w)
     for (dim_t i = 0; i < h; ++i) {
         for (dim_t j = 0; j < w; ++j) {
             ASSERT_EQ(s.offset(i, j), k);
+            {
+                dim_t u, v;
+                std::tie(u, v) = s.expand(k);
+                ASSERT_EQ(i, u);
+                ASSERT_EQ(j, v);
+            }
             ++k;
         }
     }
@@ -26,7 +32,6 @@ TEST(shape_test, test1)
     for (dim_t h = 1; h < 10; ++h) {
         for (dim_t w = 1; w < 10; ++w) { test_shape(h, w); }
     }
-
     {
         shape<5> s(10, 10, 10, 10, 10);
         ASSERT_EQ(s.offset(1, 2, 3, 4, 5), static_cast<dim_t>(12345));