Preparing version 1.8.6

Author: gfursin

CHANGES.txt

@@ -1,4 +1,4 @@
-* V1.8.5.3
+* V1.8.6
   * added direct update of kernel vars via CMD similar to Git. For example:
 
     $ ck setup kernel --var.default_license="See CK LICENSE.txt for licensing details"
@@ -7,6 +7,11 @@
     $ ck setup kernel --var.default_developer_email="[email protected]"
     $ ck setup kernel --var.default_developer_webpage="http://cTuning.org"
 
+  * added -f flag to force removal of entries (i.e. ck rm x:y -f) to be compatible
+    with bash rm -f ...
+
+  * added JSON sorting when viewing entries from CMD (via ck load x:y)
+
 * V1.8.5 
   * do not crash if renewing repo while staying inside it
   * fixed bug in "system_with_timeout" (was always returning error) - required by ck-clsmith

COPYRIGHT.txt

@@ -1 +1 @@
-(C)opyright 2014-2016 Grigori Fursin, Anton Lokhmotov and contributors
+(C)opyright 2014-2017 Grigori Fursin, Anton Lokhmotov and contributors

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2014-2016 Grigori Fursin, cTuning foundation and volunteers <[email protected]>
+Copyright 2014-2017 Grigori Fursin, cTuning foundation and volunteers <[email protected]>
 All rights reserved
 
 Redistribution and use in source and binary forms, with or without modification,

README.md

@@ -10,9 +10,10 @@ NEWS
 * Fully updated documentation is now available: [Wiki](http://github.com/ctuning/ck/wiki), [Getting Started Guide](http://github.com/ctuning/ck/wiki/Getting-started-guide), [Portable workflows](http://github.com/ctuning/ck/wiki/Portable-workflows);
 * We have moved Open Science resources [here](http://github.com/ctuning/ck/wiki/Enabling-Open-Science);
 * We have added continuous integration for Linux and Windows;
-* General Motors and dividiti shared CK workflow to crowdsource benchmarking and optimization of CAFFE (DNN framework) [here](https://github.com/dividiti/ck-caffe);
+* General Motors and dividiti crowdsource benchmarking and optimization of CAFFE (DNN framework) using CK: [GitHub](https://github.com/dividiti/ck-caffe), [Android app](https://play.google.com/store/apps/details?id=openscience.crowdsource.video.experiments);
 * CK supports [Jupyter notebooks](http://jupyter.org) and [Docker](http://github.com/ctuning/ck-docker);
 * cTuning foundation and ARM has received [HiPEAC technology transfer award](https://www.hipeac.net/research/technology-transfer-awards/2014) for the CK concept.
+* [CGO'17 paper](https://github.com/SamAinsworth/reproduce-cgo2017-paper) has its experimental workflow implemented using CK!
 
 Introduction
 ============

ck/kernel.py

@@ -10,7 +10,7 @@
 # CK kernel - we made it monolithic with a minimal set 
 # of common functions for performance reasons
 
-__version__ = "1.8.5.3"  # We use 3 digits for the main (released) version and 4th digit for development revision
+__version__ = "1.8.6"  # We use 3 digits for the main (released) version and 4th digit for development revision
                        # Do not use characters (to detect oudated version)!
 
 # Extra modules global for the whole kernel
@@ -42,11 +42,11 @@
       "default_shared_repo_url":"https://github.com/ctuning",
       "github_repo_url":"https://github.com",
 
-      "default_license":"See CK LICENSE.txt for licensing details",
-      "default_copyright":"See CK COPYRIGHT.txt for copyright details",
-      "default_developer":"cTuning foundation",
-      "default_developer_email":"[email protected]",
-      "default_developer_webpage":"http://cTuning.org",
+#      "default_license":"See CK LICENSE.txt for licensing details",
+#      "default_copyright":"See CK COPYRIGHT.txt for copyright details",
+#      "default_developer":"cTuning foundation",
+#      "default_developer_email":"[email protected]",
+#      "default_developer_webpage":"http://cTuning.org",
 
       "detect_cur_cid":"#",
       "detect_cur_cid1":"^",
@@ -5150,7 +5150,7 @@ def load(i):
               'dict':r.get('dict',{})
              }
 
-       rr=dumps_json({'dict':dd})
+       rr=dumps_json({'dict':dd, 'sort_keys':'yes'})
        if rr['return']==0:
           out(rr['string'])
 
@@ -5350,7 +5350,14 @@ def add(i):
               (tags)                 - list or comma separated list of tags to add to entry
 
               (info)                 - entry info to record - normally, should not use it!
-              (extra_info)           - enforce extra info such as author, license, etc
+              (extra_info)           - enforce extra info such as
+                                          author
+                                          author_email
+                                          author_webpage
+                                          license
+                                          copyright
+                                       If not specified then taken from kernel (prefix 'default_')
+
               (updates)              - entry updates info to record - normally, should not use it!
               (ignore_update)        - if 'yes', do not add info about update
 
@@ -5906,6 +5913,8 @@ def rm(i):
               data_uoa        - data UOA    ; can be wild cards
 
               (force)         - if 'yes', force deleting without questions
+                 or
+              (f)             - to be compatible with rm -f 
 
               (share)         - if 'yes', try to remove via GIT
 
@@ -5967,6 +5976,10 @@ def rm(i):
                              'module_uoa':muoa, 'module_uid':muid, 
                              'data_uoa':duoa, 'data_uid': duid})
 
+    force=i.get('force','')
+    if force=='':
+       force=i.get('f','')
+
     first=True
     for ll in lst:
         p=ll['path']
@@ -5999,7 +6012,7 @@ def rm(i):
 
         # If interactive
         to_delete=True
-        if o=='con' and i.get('force','')!='yes':
+        if o=='con' and force!='yes':
            r=inp({'text':'Are you sure to delete CK entry '+xcuoa+' (y/N): '})
            c=r['string'].lower()
            if c!='y' and c!='yes': to_delete=False

setup.py

@@ -10,7 +10,7 @@
 
 setup(
   name='ck',
-  version='1.8.5.3',
+  version='1.8.6',
   url='https://github.com/ctuning/ck/wiki',
   license='BSD 3-clause',
   author='Grigori Fursin and non-profit cTuning foundation',