Merge branch 'dev' of https://github.com/milk-org/milk into dev

fetch_cacao_dev.sh

@@ -5,6 +5,21 @@ if [ -d "plugins/cacao-src" ]; then
     echo "	Already installed -> pulling"
     (cd plugins/cacao-src; git pull)
 else
-    git clone -b dev https://github.com/cacao-org/cacao plugins/cacao-src
+    [ -d "$HOME/githubalt/cacao/.git" ] \
+    && repository="file://$HOME/githubalt/cacao" branchopt= \
+    || repository="https://github.com/cacao-org/cacao.git" branchopt="-b dev"
+    echo git clone $branchopt "$repository" plugins/cacao-src
+    git clone $branchopt "$repository" plugins/cacao-src
     echo ""
 fi
+
+PATCHFN=patch_cacao_lapacke_optional.txt
+( [ -r  "./$PATCHFN" ] \
+  && cd plugins/cacao-src/computeCalib/ \
+  && PATCHPATH="../../../$PATCHFN" \
+  && [ -r  "$PATCHPATH" ] \
+  && patch -s --reject-file=- -f -p 2 < "$PATCHPATH" \
+  && echo "Successfully patched CACAO computeCalib/CMakeList.txt" \
+  || echo "Failed to patch CACAO computeCalib/CMakeList.txt" \
+  || true
+)

patch_cacao_lapacke_optional.txt

@@ -0,0 +1,16 @@
+diff --git a/computeCalib/CMakeLists.txt b/computeCalib/CMakeLists.txt
+index 15b1646b..6a07c81f 100644
+--- a/computeCalib/CMakeLists.txt
++++ b/computeCalib/CMakeLists.txt
+@@ -44,8 +44,10 @@ set(LINKLIBS
+ 	CLIcore
+ 	milkinfo
+ 	cacaoAOloopControl
+-	lapacke
+ )
++if(NOT MKL_FOUND)
++  list(APPEND LINKLIBS lapacke)
++endif()
+
+
+

src/COREMOD_arith/CMakeLists.txt

@@ -65,7 +65,7 @@ set_property (TEST "${TESTNAME}" PROPERTY PASS_REGULAR_EXPRESSION "COREMOD_arith
 
 # test that commands are registered
 
-list(APPEND commandlist "extractim" "extract3Dim" "setpix" "setpix1Drange" "setrow" "setcol" "imzero" "imtrunc" "merge3d" "cropmask")
+list(APPEND commandlist "extractim" "extract3Dim" "setpix" "setpix1Drange" "setrow" "setcol" "imzero" "imtrunc" "cropmask")
 
 foreach(CLIcmdname IN LISTS commandlist)
 

src/COREMOD_memory/CMakeLists.txt

@@ -149,7 +149,7 @@ set_property (TEST "${TESTNAME}" PROPERTY PASS_REGULAR_EXPRESSION "COREMOD_memor
 
 # test that commands are registered
 
-list(APPEND commandlist "creaim" "creaimshm" "listim" "mmon" "rmall")
+list(APPEND commandlist "mk2Dim" "mk3Dim" "listim" "mmon" "rmall")
 
 foreach(CLIcmdname IN LISTS commandlist)
 
@@ -170,7 +170,7 @@ set(TESTNAME "milksemloopspeed")
 add_test (NAME "${TESTNAME}" COMMAND milk-semloopspeed "123456")
 set_property (TEST "${TESTNAME}" PROPERTY LABELS "perf")
 set_property (TEST "${TESTNAME}" PROPERTY TIMEOUT 5)
-set_property (TEST "${TESTNAME}" PROPERTY PASS_REGULAR_EXPRESSION "cnt0 = 123456")
+set_property (TEST "${TESTNAME}" PROPERTY PASS_REGULAR_EXPRESSION "cnt0 = 123457")
 
 
 

src/COREMOD_memory/scripts/milk-semloopspeed

@@ -49,8 +49,8 @@ SEMTRIG="3"
 
 
 milk << EOF
-creaimshm imA 100 100
-creaimshm imB 100 100
+mk2Dim "s>imA" 100 100
+mk2Dim "s>imB" 100 100
 imsetsempost imA -1
 imsetsempost imB -1
 exitCLI

src/CommandLineInterface/fps/fps_printparameter_valuestring.c

@@ -15,131 +15,159 @@ errno_t functionparameter_PrintParameter_ValueString(
 
     switch(fpsentry->type)
     {
-    case FPTYPE_INT64:
-        SNPRINTF_CHECK(outstring,
-                       stringmaxlen,
-                       "%s INT64  %ld",
-                       fpsentry->keywordfull,
-                       fpsentry->val.i64[0]);
-        cmdOK = 1;
-        break;
-
-    case FPTYPE_FLOAT64:
-        SNPRINTF_CHECK(outstring,
-                       stringmaxlen,
-                       "%s FLOAT64 %f",
-                       fpsentry->keywordfull,
-                       fpsentry->val.f64[0]);
-        cmdOK = 1;
-        break;
-
-    case FPTYPE_FLOAT32:
-        SNPRINTF_CHECK(outstring,
-                       stringmaxlen,
-                       "%s FLOAT32 %f",
-                       fpsentry->keywordfull,
-                       fpsentry->val.f32[0]);
-        cmdOK = 1;
-        break;
-
-    case FPTYPE_PID:
-        SNPRINTF_CHECK(outstring,
-                       stringmaxlen,
-                       "%s PID %ld",
-                       fpsentry->keywordfull,
-                       fpsentry->val.i64[0]);
-        cmdOK = 1;
-        break;
-
-    case FPTYPE_TIMESPEC:
-        SNPRINTF_CHECK(outstring,
-                       stringmaxlen,
-                       "%s TIMESPEC %ld.%09ld",
-                       fpsentry->keywordfull,
-                       fpsentry->val.ts->tv_sec,
-                       fpsentry->val.ts->tv_nsec);
-        break;
-
-    case FPTYPE_FILENAME:
-        SNPRINTF_CHECK(outstring,
-                       stringmaxlen,
-                       "%s FILENAME %s",
-                       fpsentry->keywordfull,
-                       fpsentry->val.string[0]);
-        cmdOK = 1;
-        break;
-
-    case FPTYPE_FITSFILENAME:
-        SNPRINTF_CHECK(outstring,
-                       stringmaxlen,
-                       "%s FITSFILENAME %s",
-                       fpsentry->keywordfull,
-                       fpsentry->val.string[0]);
-        cmdOK = 1;
-        break;
-
-    case FPTYPE_EXECFILENAME:
-        SNPRINTF_CHECK(outstring,
-                       stringmaxlen,
-                       "%s EXECFILENAME %s",
-                       fpsentry->keywordfull,
-                       fpsentry->val.string[0]);
-        cmdOK = 1;
-        break;
-
-    case FPTYPE_DIRNAME:
-        SNPRINTF_CHECK(outstring,
-                       stringmaxlen,
-                       "%s DIRNAME %s",
-                       fpsentry->keywordfull,
-                       fpsentry->val.string[0]);
-        cmdOK = 1;
-        break;
-
-    case FPTYPE_STREAMNAME:
-        SNPRINTF_CHECK(outstring,
-                       stringmaxlen,
-                       "%s STREAMNAME %s",
-                       fpsentry->keywordfull,
-                       fpsentry->val.string[0]);
-        cmdOK = 1;
-        break;
-
-    case FPTYPE_STRING:
-        SNPRINTF_CHECK(outstring,
-                       stringmaxlen,
-                       "%s STRING %s",
-                       fpsentry->keywordfull,
-                       fpsentry->val.string[0]);
-        cmdOK = 1;
-        break;
-
-    case FPTYPE_ONOFF:
-        if(fpsentry->fpflag & FPFLAG_ONOFF)
-        {
+
+        case FPTYPE_UINT32:
+            SNPRINTF_CHECK(outstring,
+                           stringmaxlen,
+                           "%s UINT32 %u",
+                           fpsentry->keywordfull,
+                           fpsentry->val.ui32[0]);
+            cmdOK = 1;
+            break;
+
+        case FPTYPE_INT32:
+            SNPRINTF_CHECK(outstring,
+                           stringmaxlen,
+                           "%s INT32  %d",
+                           fpsentry->keywordfull,
+                           fpsentry->val.i32[0]);
+            cmdOK = 1;
+            break;
+
+        case FPTYPE_UINT64:
+            SNPRINTF_CHECK(outstring,
+                           stringmaxlen,
+                           "%s UINT64 %lu",
+                           fpsentry->keywordfull,
+                           fpsentry->val.ui64[0]);
+            cmdOK = 1;
+            break;
+
+        case FPTYPE_INT64:
+            SNPRINTF_CHECK(outstring,
+                           stringmaxlen,
+                           "%s INT64  %ld",
+                           fpsentry->keywordfull,
+                           fpsentry->val.i64[0]);
+            cmdOK = 1;
+            break;
+
+        case FPTYPE_FLOAT64:
+            SNPRINTF_CHECK(outstring,
+                           stringmaxlen,
+                           "%s FLOAT64 %f",
+                           fpsentry->keywordfull,
+                           fpsentry->val.f64[0]);
+            cmdOK = 1;
+            break;
+
+        case FPTYPE_FLOAT32:
+            SNPRINTF_CHECK(outstring,
+                           stringmaxlen,
+                           "%s FLOAT32 %f",
+                           fpsentry->keywordfull,
+                           fpsentry->val.f32[0]);
+            cmdOK = 1;
+            break;
+
+        case FPTYPE_PID:
+            SNPRINTF_CHECK(outstring,
+                           stringmaxlen,
+                           "%s PID %ld",
+                           fpsentry->keywordfull,
+                           fpsentry->val.i64[0]);
+            cmdOK = 1;
+            break;
+
+        case FPTYPE_TIMESPEC:
+            SNPRINTF_CHECK(outstring,
+                           stringmaxlen,
+                           "%s TIMESPEC %ld.%09ld",
+                           fpsentry->keywordfull,
+                           fpsentry->val.ts->tv_sec,
+                           fpsentry->val.ts->tv_nsec);
+            break;
+
+        case FPTYPE_FILENAME:
+            SNPRINTF_CHECK(outstring,
+                           stringmaxlen,
+                           "%s FILENAME %s",
+                           fpsentry->keywordfull,
+                           fpsentry->val.string[0]);
+            cmdOK = 1;
+            break;
+
+        case FPTYPE_FITSFILENAME:
+            SNPRINTF_CHECK(outstring,
+                           stringmaxlen,
+                           "%s FITSFILENAME %s",
+                           fpsentry->keywordfull,
+                           fpsentry->val.string[0]);
+            cmdOK = 1;
+            break;
+
+        case FPTYPE_EXECFILENAME:
+            SNPRINTF_CHECK(outstring,
+                           stringmaxlen,
+                           "%s EXECFILENAME %s",
+                           fpsentry->keywordfull,
+                           fpsentry->val.string[0]);
+            cmdOK = 1;
+            break;
+
+        case FPTYPE_DIRNAME:
+            SNPRINTF_CHECK(outstring,
+                           stringmaxlen,
+                           "%s DIRNAME %s",
+                           fpsentry->keywordfull,
+                           fpsentry->val.string[0]);
+            cmdOK = 1;
+            break;
+
+        case FPTYPE_STREAMNAME:
+            SNPRINTF_CHECK(outstring,
+                           stringmaxlen,
+                           "%s STREAMNAME %s",
+                           fpsentry->keywordfull,
+                           fpsentry->val.string[0]);
+            cmdOK = 1;
+            break;
+
+        case FPTYPE_STRING:
             SNPRINTF_CHECK(outstring,
                            stringmaxlen,
-                           "%s ONOFF ON",
-                           fpsentry->keywordfull);
-        }
-        else
-        {
+                           "%s STRING %s",
+                           fpsentry->keywordfull,
+                           fpsentry->val.string[0]);
+            cmdOK = 1;
+            break;
+
+        case FPTYPE_ONOFF:
+            if(fpsentry->fpflag & FPFLAG_ONOFF)
+            {
+                SNPRINTF_CHECK(outstring,
+                               stringmaxlen,
+                               "%s ONOFF ON",
+                               fpsentry->keywordfull);
+            }
+            else
+            {
+                SNPRINTF_CHECK(outstring,
+                               stringmaxlen,
+                               "%s ONOFF OFF",
+                               fpsentry->keywordfull);
+            }
+            cmdOK = 1;
+            break;
+
+        case FPTYPE_FPSNAME:
             SNPRINTF_CHECK(outstring,
                            stringmaxlen,
-                           "%s ONOFF OFF",
-                           fpsentry->keywordfull);
-        }
-        cmdOK = 1;
-        break;
-
-    case FPTYPE_FPSNAME:
-        SNPRINTF_CHECK(outstring,
-                       stringmaxlen,
-                       "%s FPSNAME %s",
-                       fpsentry->keywordfull,
-                       fpsentry->val.string[0]);
-        cmdOK = 1;
-        break;
+                           "%s FPSNAME %s",
+                           fpsentry->keywordfull,
+                           fpsentry->val.string[0]);
+            cmdOK = 1;
+            break;
     }
 
     if(cmdOK == 1)

src/milk_module_example/scripts/milk-semtestspeed

@@ -10,8 +10,8 @@ SEMTRIG="$2"
 NBLOOP="$1"
 
 milk << EOF
-creaimshm imA 100 100
-creaimshm imB 100 100
+mk2Dim "s>imA" 100 100
+mk2Dim "s>imB" 100 100
 imsetsempost imA -1
 imsetsempost imB -1
 exitCLI