cnvrg 1.9.6 → 1.9.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84b1379d995cf6475f7a0a946560bb3c1d438fd514c83df2123251dc4f7de560
-  data.tar.gz: 862caef093f400c6645b2cb311379fd976539fde8f7544a1146d603e0cdb3a13
+  metadata.gz: 53ddc2741cb68ba2e0a7952883931cbfc6fc6d0c92ba2a98cd99c3d4bac350ef
+  data.tar.gz: 17a78f413fa1a65027826cf9d4a411176c938e9c260eae5d7813c19c9b6e5e56
 SHA512:
-  metadata.gz: e4548991e1debc2c5c389af062cc0f73da8d172cf2ee1614315356e47203f490f2b147010e1a41913c75b071ccbd4174dbff7a44fea0816135b7f1f1b8965c21
-  data.tar.gz: f29420115fd784a0e57d44af5ec265d5c39f2636f998c630d0c21138c46b3fd517997c05d3eb48d8917c3c6ef0e5689081df052b01080185387240222003fd13
+  metadata.gz: c7bc53a1b26f86dc619a80c6bde93e93908916f665dd2e41742c1645cb855ac3b7f36ee1a32ed324204435ca18a6a6f6b4330cede901d1ae6a149affbb14f6a4
+  data.tar.gz: b17527598197acdd1bc0f00b0f461dc38bb621674ffd2ac144cedc68a4b64097fc898c4b9f4f6c562657e656d1cfdcaa79acdae53ec00d7016d85bee2252f519

data/lib/cnvrg/cli.rb

@@ -4584,7 +4584,7 @@ module Cnvrg
 
     end
 
-    desc 'file_exists', description: '', hide: true
+    desc 'file_exists', '', :hide => true
     def file_exists(file)
       exit(0) if File.exists? file
       exit(1)

data/lib/cnvrg/cli/library_cli.rb

@@ -1,7 +1,7 @@
 module Cnvrg
   class LibraryCli < SubCommandBase
 
-    desc "library import", description: ""
+    desc "library import", ''
     def import
       unless File.exists? "library.yml"
         Cnvrg::CLI.log_message("Can't find library.yml", 'red')

data/lib/cnvrg/datafiles.rb

@@ -1,5 +1,5 @@
 require 'mimemagic'
-require 'aws-sdk'
+require 'aws-sdk-s3'
 require 'URLcrypt'
 require 'parallel'
 require 'fileutils'
@@ -330,7 +330,7 @@ module Cnvrg
 
     end
 
-    def upload_multiple_files_optimized(files, commit_sha1, threads: ParallelThreads, chunk_size: 1000, force: false, new_branch: false, prefix: '', partial_commit: nil)
+    def upload_multiple_files_optimized(files, commit_sha1, threads: 15, chunk_size: 1000, force: false, new_branch: false, prefix: '', partial_commit: nil)
       cli = CLI.new
       cli.log_message("Using #{threads} threads with chunk size of #{chunk_size}.", Thor::Shell::Color::GREEN)
 
@@ -406,7 +406,7 @@ module Cnvrg
         # Fetch the required files from the server:
         Parallel.map((file_chunks), in_threads: 10) do |files_chunk|
 
-          tree = @dataset.generate_chunked_idx(files_chunk, prefix: prefix)
+          tree = @dataset.generate_chunked_idx(files_chunk, prefix: prefix, threads: threads)
           results = request_upload_files(commit_sha1, tree, force, new_branch, partial_commit)
 
           # puts "Got #{results['files'].size} files to upload from #{files_chunk.size} files"
@@ -1319,10 +1319,10 @@ module Cnvrg
               # blob
             local_path = "#{local_path}.conflict" if conflict
             storage_path = f["path"]
-            if File.exists? local_path
-              Cnvrg::Logger.log_info("Trying to download #{local_path} but its already exists, skipping..")
-              next
-            end
+            # if File.exists? local_path
+            #   Cnvrg::Logger.log_info("Trying to download #{local_path} but its already exists, skipping..")
+            #   next
+            # end
             resp = @downloader.download(storage_path, local_path)
             Cnvrg::Logger.log_info("Download #{local_path} success resp: #{resp}")
           rescue => e

data/lib/cnvrg/dataset.rb

@@ -541,7 +541,7 @@ module Cnvrg
       "#{url}/#{self.owner}/datasets/#{self.slug}"
     end
 
-    def generate_chunked_idx(list_files = [], threads: IDXParallelThreads, prefix: '')
+    def generate_chunked_idx(list_files = [], threads: 15, prefix: '')
       tree = {}
       Parallel.map(list_files, in_threads: threads) do |file|
         #check if prefix exists do prefix/path otherwise path

data/lib/cnvrg/files.rb

@@ -1,5 +1,5 @@
 require 'mimemagic'
-require 'aws-sdk'
+require 'aws-sdk-s3'
 require 'URLcrypt'
 require 'tempfile'
 require 'net/http'
@@ -727,7 +727,6 @@ module Cnvrg
       unless Cnvrg::CLI.is_response_success(res, false)
         raise SignalException.new("Cant download files from the server.")
       end
-      puts res
       self.download_multpile_files_s3(res['result'], @project_home, postfix: postfix, progress: progress)
     end
 

data/lib/cnvrg/helpers/executer.rb

@@ -89,7 +89,7 @@ class Cnvrg::Helpers::Executer
   end
 
   def current_homedir
-    `env | grep HOME`.strip.split("=").try(:last)
+    `env | grep -w HOME`.strip.split("=").try(:last)
   end
 
   def spark_path
@@ -97,7 +97,7 @@ class Cnvrg::Helpers::Executer
   end
 
   def slave_homedir()
-    run_in_slave("env | grep HOME").split("=").try(:last)
+    run_in_slave("env | grep -w HOME").split("=").try(:last)
   end
 
   def slave_env

data/lib/cnvrg/job_cli.rb

@@ -1,7 +1,7 @@
 module Cnvrg
     class JobCli < SubCommandBase
 
-        desc 'log', description: '', hide: true
+        desc 'log', '', :hide => true
         method_option :level, :type => :string, :aliases => ["-l", "--level"], :default => 'info'
         method_option :step, :type => :string, :aliases => ["-s", "--step"], :default => nil
         method_option :restart, :type => :boolean, :aliases => ["-r", "--restart"], :default => false
@@ -15,7 +15,7 @@ module Cnvrg
             end
         end
 
-        desc 'requirements', description: '', hide: true
+        desc 'requirements', '', :hide => true
         def requirements
           cli = Cnvrg::CLI.new
           cli.log_start(__method__, args, options)
@@ -23,7 +23,7 @@ module Cnvrg
           @project = Project.new(project_dir, owner: ENV['CNVRG_OWNER'], slug: ENV['CNVRG_PROJECT'])
         end
 
-        desc 'install_reqs', description: 'Install requirements', hide: true
+        desc 'install_reqs', 'Install requirements', :hide => true
         def install_reqs
             cli = Cnvrg::CLI.new
             cli.log_start(__method__, args, options)
@@ -33,8 +33,7 @@ module Cnvrg
             @executer.execute_cmds(commands)
         end
 
-
-        desc 'start', description: "Job Start!", hide: true
+        desc 'start', 'Job Start!', :hide => true
         def start
             cli = Cnvrg::CLI.new
             cli.log_start(__method__, args, options)
@@ -47,7 +46,7 @@ module Cnvrg
             @executer.main_thread
         end
 
-        desc 'stats', description: 'stats of agent and slave', hide: true
+        desc 'stats', 'stats of agent and slave', :hide => true
         def stats
             cli = Cnvrg::CLI.new
             cli.log_start(__method__, args, options)
@@ -59,7 +58,7 @@ module Cnvrg
             @executer.executer_stats
         end
 
-        desc 'pre_pod_stop', description: 'test', hide: true
+        desc 'pre_pod_stop', '', :hide => true
         def pre_pod_stop
             cli = Cnvrg::CLI.new
             cli.log_start(__method__, args, options)

data/lib/cnvrg/job_ssh.rb

@@ -1,6 +1,7 @@
 module Cnvrg
   class JobSsh < SubCommandBase
-    desc 'ssh start', description: 'job_id', hide: false
+
+    desc 'ssh start', 'stats of agent and slave'
     method_option :port, :type => :numeric, :aliases => ["-p", "--port"], :desc => "Port to bind into", :default => 2222
     method_option :username, :type => :string, :aliases => ["-u", "--username"], :desc => "Job container user name", :default => nil
     method_option :password, :type => :string, :aliases => ["--password"], :desc =>"Job Conatainer user name, will be set by cnvrg", :default => nil

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.9.6'
+  VERSION = '1.9.9.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 1.9.9.3
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler