cnvrg 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e3a5bae5049d633360023ea911ceeb97ed85696
-  data.tar.gz: 1f3b1959efd5784162d3d715b2b671188907297f
+  metadata.gz: 2ee9c0e3238c8332892001f157476627c8b9f02e
+  data.tar.gz: a2b064a49793fb05f1f48c137912bb2555e22c60
 SHA512:
-  metadata.gz: 85643c72891b74c4282ce4991f8c7e572c1f21af287cb8883707ce1fbd34368a935e2508ac83610148f1caff3e86d1febd351dd0e129625da1a66e5ecf183414
-  data.tar.gz: ac285e4ddc22e20f4c7a811b59e82757e82f8686eaaae5d029a0aa2997bcb987283b1655a46dc7e87d1a44682cee4b504dcba99337064834ade2d80a60c8de04
+  metadata.gz: cda986e64bf59d86bc56efb32a153f6c98b7defd4d78909edb80fbbcdaee75d7ec76a3f1378dc6e646da868b2e304989391a394925ceb5930305316f385adc8e
+  data.tar.gz: ecdbd8613ade9bc6502ec610edc56a1a706638571f8ed9670976b320f497748838f7cc48664962600efa8a1d8ebe525a15d8eb52622802d951df6f378e514e2a

data/lib/cnvrg/cli.rb

@@ -1730,7 +1730,7 @@ module Cnvrg
 
           if !files.nil?
             begin
-              download_result = @files.download_multiple_files_s3(files, project_home)
+              download_result = @files.download_multpile_files_s3(files, project_home)
 
             rescue Interrupt
               log_message("Couldn't download, Rolling Back all changes.", Thor::Shell::Color::RED)
@@ -2128,8 +2128,12 @@ module Cnvrg
         files_count = all_files.count
         finished_chunks = 0
         files_uploaded = 0
-        all_files.each_slice(chunk_size).each do |list_files|
+        chunked_files  = all_files.each_slice(chunk_size)
+        chunked_files.each_with_index do |list_files,i|
+          log_message("generating chunk #{i} / #{chunked_files.size}", Thor::Shell::Color::BLUE, false)
           temp_tree = @dataset.generate_chunked_idx(list_files, threads: parallel_threads)
+
+          log_message("uploading chunk #{i} / #{chunked_files.size}", Thor::Shell::Color::BLUE, false)
           files_uploaded += @files.upload_multiple_files(next_commit, temp_tree, threads: parallel_threads, force: force)
           new_tree = new_tree.merge(temp_tree.map{|k,v| [k.gsub('./', ''), {sha1: v[:sha1], commit_time: nil}]}.to_h)
           @dataset.write_idx(new_tree, next_commit)
@@ -2138,6 +2142,7 @@ module Cnvrg
         end
         return files_uploaded > 0
       rescue Exception => e
+        log_error(e)
         return false
       end
 
@@ -2371,6 +2376,7 @@ module Cnvrg
         if !spec_files_to_upload.blank?
           spec_files_to_upload = spec_files_to_upload.split(",")
         end
+        if @project.is_git
         git_output_dir = options["output_dir"] || output_dir
         if git_output_dir.present?
           if git_output_dir.ends_with? "/"
@@ -2384,6 +2390,8 @@ module Cnvrg
           end
           force = true
         end
+        end
+
 
         if ignore.nil? or ignore.empty?
           ignore = ignore_list
@@ -3451,7 +3459,6 @@ module Cnvrg
                   spot_status_thread = Thread.new do
                     begin
                       loop do
-                        puts "Checking Spot Instance Status"
                         log_message('Checking Spot Instance Status', Thor::Shell::Color::YELLOW)
                         restart = @exp.restart_spot_instance()
 

data/lib/cnvrg/data.rb

@@ -47,7 +47,7 @@ module Cnvrg
     method_option :tags, :type => :boolean, :aliases => ["--tags"], :desc => "upload file tags", :default => false
     method_option :parallel, :type => :numeric, :aliases => ["-p", "--parallel"], :desc => "uparallel upload at the same time", :default => 15
     method_option :chunk_size, :type => :numeric, :aliases => ["--chunk_size"], :desc => "chunk size to communicate with the server", :default => 1000
-    method_option :init, :type => :boolean, :aliases => ["--initial"], :desc => "chunk size to communicate with the server", :default => false
+    method_option :init, :type => :boolean, :aliases => ["--initial"], :desc => "initial upload of dataset", :default => false
 
     def sync_data_new()
       cli = Cnvrg::CLI.new()

data/lib/cnvrg/experiment.rb

@@ -138,14 +138,6 @@ module Cnvrg
 
     def restart_spot_instance
       restart = false
-      #TODO: remove this later
-      fall_number = rand(1..8)
-      if fall_number == 5
-        return true
-      else
-        return false
-      end
-
       begin
       url = URI.parse('http://169.254.169.254/latest/meta-data/spot/termination-time')
       req = Net::HTTP::Get.new(url.to_s)

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.5.8'
+  VERSION = '0.5.9'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler