cnvrg 0.0.1418 → 0.0.1420

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e5e43e32a2a764d0177be682b7957bdaa6c184b
-  data.tar.gz: a1bd77092a713f3f6edb16f0f2bbb998d3a795d2
+  metadata.gz: f94403f39c98e7d4c89c32d9c066f6cc82bf9833
+  data.tar.gz: 2aa4bbda3018ee9d4615f343db4bbc4e420bfdd0
 SHA512:
-  metadata.gz: f60c19507e5eed03dd015ec4d8d03694cf518692057ba969b64cc62a2208d50e02007ace23c0d82740ffe263f685271610ba58f87d22a6866c0bd2d4021ab54a
-  data.tar.gz: 8049f800636d14a9de359dd580bece4a28cf6422304e65d17862e5aa85b83604aa9bf798c70b322c2bbcbafc6a40e3bf1659dbb6823d2050f044cd6b58468fef
+  metadata.gz: deab7e2a08f9e01744970c10641039cda7f56bd080d9cd6d0da49b1e2cd1c95e983c4b519a652f3ccf4d6aaf01c4cd074dba96140bce9a3adf06a2fb5bca7c3e
+  data.tar.gz: c8632b9c983025873f92ec07b64498c2625467c9a2e9593420cc9edf4d0c0f09278332d7a5dde58440b34c9e7e669f070804747fd6b4801787540af869b1b8be

data/lib/cnvrg/cli.rb

@@ -115,7 +115,7 @@ class Thor
 
     def is_option (options, p)
       options.each do |o|
-        if (!o.aliases.nil? and o.aliases[0].split(",").include? p) or o.switch_name.eql? p
+        if (!o.aliases.nil? and (o.aliases[0].split(",").include? p or o.aliases.include? p)) or o.switch_name.eql? p
           return o
         end
       end
@@ -2150,6 +2150,7 @@ module Cnvrg
 
       email_notification = options["email_notification"]
       upload_output = options["upload_output"]
+      upload_output = "1m" if upload_output.nil? or upload_output.empty?
       time_to_upload = calc_output_time(upload_output)
       project_home = get_project_home
       @project = Project.new(project_home)
@@ -2195,7 +2196,7 @@ module Cnvrg
         start_commit = @project.last_local_commit
         cmd = cmd.join("\s")
 
-        say "Running: #{cmd}\n", Thor::Shell::Color::BLUE
+
 
         @exp = Experiment.new(@project.owner, @project.slug)
 
@@ -2204,6 +2205,8 @@ module Cnvrg
         begin
           machine_activity = @exp.get_machine_activity(working_dir)
           @exp.start(cmd, platform, machine_name, start_commit, title, email_notification, machine_activity, script_path)
+          say "Experiment's live results: #{Cnvrg::Helpers.remote_url}/#{@project.owner}/projects/#{@project.slug}/experiments/#{@exp.slug}", Thor::Shell::Color::GREEN
+          say "Running: #{cmd}\n", Thor::Shell::Color::BLUE
           unless @exp.slug.nil?
             real = Time.now
             exp_success = true
@@ -2321,7 +2324,7 @@ module Cnvrg
 
                 res = @exp.end(log, exit_status, end_commit, cpu_average, memory_average)
                 check = Helpers.checkmark()
-                say "#{check} Done. Experiment's result: #{Cnvrg::Helpers.remote_url}/#{@project.owner}/projects/#{@project.slug}/experiments/#{@exp.slug}", Thor::Shell::Color::GREEN
+                say "#{check} Done. Experiment's results were updated!", Thor::Shell::Color::GREEN
                 log_end(0)
               end
             rescue => e
@@ -2691,17 +2694,27 @@ module Cnvrg
     end
 
     desc 'deploy', 'Deploys model to production'
-    method_option :machine_type, :type => :string, :aliases => ["--i", "-i"], :default => ""
-    method_option :schedule, :type => :string, :aliases => ["--s", "-s"], :default => ""
-    method_option :commit, :type => :string, :aliases => ["--c", "-c"], :default => ""
+    method_option :small, :type => :boolean, :aliases => ["-sm", "--small"], :default => false
+    method_option :medium, :type => :boolean, :aliases => ["-md", "--medium"], :default => false
+    method_option :large, :type => :boolean, :aliases => ["-lg", "--large"], :default => false
+    method_option :gpu, :type => :boolean, :aliases => ["--gpu"], :default => false
+    method_option :gpuxl, :type => :boolean, :aliases => ["--gpuxl"], :default => false
+    method_option :gpuxxl, :type => :boolean, :aliases => ["--gpuxxl"], :default => false
+    method_option :schedule, :type => :string, :aliases => ["--schedule", "-s"], :default => ""
+
+    method_option :commit, :type => :string, :aliases => ["--commit", "-c"], :default => ""
+    method_option :workers, :type => :string, :aliases => ["--workers", "-w"], :default => ""
+    method_option :file_as_input, :type => :boolean, :aliases => ["--input", "-i"], :default => false
 
     def deploy(file_to_run, function)
       verify_logged_in(true)
       log_start(__method__, args, options)
       working_dir = is_cnvrg_dir
       begin
+        instances = {"small" => options["small"], "medium" => options["medium"], "large" => options["large"],
+                     "gpu" => options["gpu"], "gpuxl" => options["gpuxl"], "gpuxxl" => options["gpuxxl"]}
+        instance_type = get_instance_type(instances)
 
-        instance_type = options["machine_type"] || nil
         schedule = options["schedule"] || ""
 
 
@@ -2713,17 +2726,30 @@ module Cnvrg
         project = Project.new(working_dir)
         commit_to_run = options["commit"] || nil
 
+        workers = options["workers"] || nil
+        begin
+          num_workers = workers.to_i
+
+          puts workers
+        rescue
+          say "Number of workers should be a number between 1 to 10", Thor::Shell::Color::RED
+          exit(1)
+        end
+
+        exit(0)
+        file_as_input = options["file_as_input"] || false
+
 
         image = is_project_with_docker(working_dir)
         if !image or !image.is_docker
-          say "Couldn't find image related to project", Thor::Shell::Color::RED
-          default = yes? "use cnvrg default image?", Thor::Shell::Color::YELLOW
-          if default
-            image = Images.new(working_dir, "cnvrg")
-            image_slug = image.image_slug
-          else
-            exit(0)
-          end
+          # say "Couldn't find image related to project", Thor::Shell::Color::RED
+          # default = yes? "use cnvrg default image?", Thor::Shell::Color::YELLOW
+          # if default
+          image = Images.new(working_dir, "cnvrg")
+          image_slug = image.image_slug
+          # else
+          #   exit(0)
+          # end
         else
           image_slug = image.image_slug
         end
@@ -2731,7 +2757,7 @@ module Cnvrg
 
         invoke :sync, [false], []
 
-        res = project.deploy(file_to_run, function, nil, commit_to_run, instance_type, image_slug, schedule, local_timestamp)
+        res = project.deploy(file_to_run, function, nil, commit_to_run, instance_type, image_slug, schedule, local_timestamp,num_workers,file_as_input)
 
         if Cnvrg::CLI.is_response_success(res)
 
@@ -3852,11 +3878,7 @@ module Cnvrg
         # container.start()
         command = ["/bin/bash", "-lc", "sudo echo -e \"#{login_content}\" >/home/ds/.netrc"]
         container.exec(command, tty: true)
-        command = ["/bin/bash", "-lc", "mkdir /home/ds/.cnvrg"]
-        container.exec(command, tty: true)
-        command = ["/bin/bash", "-lc", "mkdir /home/ds/.cnvrg/tmp"]
-        container.exec(command, tty: true)
-        command = ["/bin/bash", "-lc", "sudo chown -R ds /home/ds/.cnvrg /home/ds/.netrc"]
+        command = ["/bin/bash", "-lc", "sudo chown -R ds:ds /home/ds/.netrc"]
         container.exec(command, tty: true)
         command = ["/bin/bash", "-lc", "sudo chmod 0600 /home/ds/.netrc"]
         container.exec(command, tty: true)
@@ -3875,7 +3897,7 @@ module Cnvrg
     end
 
     desc '', '', :hide => true
-    method_option :login, :type => :string, :aliases => ["-l", "--l"], :default => ""
+    method_option :login, :type => :string, :aliases => ["-l"], :default => ""
 
     def config_flask_remote(image_name, port=80)
       local_images = Docker::Image.all
@@ -3908,16 +3930,50 @@ module Cnvrg
         container.start()
         command = ["/bin/bash", "-lc", "sudo echo -e \"#{login_content}\" >/home/ds/.netrc"]
         container.exec(command, tty: true)
-        command = ["/bin/bash", "-lc", "mkdir /home/ds/.cnvrg"]
+        command = ["/bin/bash", "-lc", "sudo chown -R ds:ds /home/ds/.netrc"]
         container.exec(command, tty: true)
-        command = ["/bin/bash", "-lc", "mkdir /home/ds/.cnvrg/tmp"]
+        command = ["/bin/bash", "-lc", "sudo chmod 0600 /home/ds/.netrc"]
         container.exec(command, tty: true)
-        command = ["/bin/bash", "-lc", "sudo chown -R ds /home/ds/.cnvrg /home/ds/.netrc"]
+        say "#{container.id}:#{port}"
+      rescue => e
+        pus e
+        if e.message.include? "is not running"
+          return "port is taken"
+        end
+        puts "error"
+        if container
+          container.kill()
+        end
+        return false
+      end
+    end
+
+    desc '', '', :hide => true
+    method_option :login, :type => :string, :aliases => ["-l"], :default => ""
+
+    def config_flask_remote_gpu(image_name, port=80)
+      local_images = Docker::Image.all
+
+      docker_image_local = local_images.map { |x| x.info["RepoTags"] }.flatten.select { |y| y.eql? "#{image_name}:latest" }.flatten
+      if docker_image_local.empty?
+        say "no image"
+        exit(1)
+      end
+
+      begin
+        login_content = options["login"]
+        container_id = `nvidia-docker run -itd -p 80:80 -w /home/ds/app #{image_name}:latest /usr/local/cnvrg/start_super.sh`
+        container_id = container_id.gsub("\n", "")
+        container = Docker::Container.get(container_id)
+        command = ["/bin/bash", "-lc", "sudo echo -e \"#{login_content}\" >/home/ds/.netrc"]
+        container.exec(command, tty: true)
+        command = ["/bin/bash", "-lc", "sudo chown -R ds:ds /home/ds/.netrc"]
         container.exec(command, tty: true)
         command = ["/bin/bash", "-lc", "sudo chmod 0600 /home/ds/.netrc"]
         container.exec(command, tty: true)
         say "#{container.id}:#{port}"
       rescue => e
+        puts e
         if e.message.include? "is not running"
           return "port is taken"
         end

data/lib/cnvrg/datafiles.rb

@@ -247,7 +247,7 @@ module Cnvrg
         python_version=`python --version  > /dev/null 2>&1` ;  is_python=$?.success?
         if is_python
 
-          s4cmd=`pip freeze |grep s4cmd > /dev/null 2>&1` ;  s4cmd_suc=$?.success?
+          s4cmd=`pip freeze 2>/dev/null |grep -e s4cmd -e boto3 > /dev/null 2>&1` ;  s4cmd_suc=$?.success?
           if !s4cmd_suc
             `pip install s4cmd  > /dev/null 2>&1` ; s4cmd_install_suc=$?.success?
           end

data/lib/cnvrg/files.rb

@@ -227,7 +227,7 @@ module Cnvrg
         python_version=`python --version  > /dev/null 2>&1` ;  is_python=$?.success?
         if is_python
 
-          s4cmd=`pip freeze |grep s4cmd > /dev/null 2>&1` ;  s4cmd_suc=$?.success?
+          s4cmd=`pip freeze 2>/dev/null |grep -e s4cmd -e boto3 > /dev/null 2>&1` ;  s4cmd_suc=$?.success?
           if !s4cmd_suc
             `pip install s4cmd  > /dev/null 2>&1` ; s4cmd_install_suc=$?.success?
           end

data/lib/cnvrg/project.rb

@@ -315,13 +315,14 @@ module Cnvrg
         return true
       end
 
-      def deploy(file_to_run, function, input_params, commit_to_run, instance_type, image_slug, scheduling_query, local_timestamp)
+      def deploy(file_to_run, function, input_params, commit_to_run, instance_type, image_slug, scheduling_query, local_timestamp,workers, file_input)
         response = Cnvrg::API.request("users/#{@owner}/projects/#{@slug}/deploy", 'POST', {file_to_run: file_to_run, function: function,
                                                                                            image_slug: image_slug, input_params: input_params,
                                                                                            commit_sha1: commit_to_run,
                                                                                            instance_type: instance_type,
                                                                                            scheduling_query: scheduling_query,
-                                                                                           local_timestamp: local_timestamp})
+                                                                                           local_timestamp: local_timestamp,
+                                                                                            workers:workers,file_input:file_input})
         return response
       end
 

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-    VERSION = '0.0.1418'
+    VERSION = '0.0.1420'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.1418
+  version: 0.0.1420
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler