origen 0.7.36 → 0.7.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1118662c21d50b42e5f844b07a727e4bdf7aa669
-  data.tar.gz: 9e1479f4346e08d9e04495ded26ee4fab9a09de4
+  metadata.gz: 2b4c41a7e948c18b50b0152e4d9a8282e78e4f81
+  data.tar.gz: 5ec4a78d31f5710389eee3d3802ed40af095154c
 SHA512:
-  metadata.gz: dfb87c30e2a997642ef231e6a1c32a9f502d36d54a6ea1be474bbf01b8ad66078c100bf7a925552537bb884fe697208c1e4f7385aa74937d20582897fca41fcd
-  data.tar.gz: ea5afacc77fa582f6d8869026d292dc7bbe82bf9fac94d712a576cd43c84e7b7baa9cbcb4487e82316ecc93dd47fb4121ad36042f827338e8d751e609b85172d
+  metadata.gz: b866b7e53ffeb9933795a15586746a5ea51f5c044a780accb391bff10963acec7c8836ffddf447aade0f5ecffdde18b78a3b900349fde1895a2398c845e03566
+  data.tar.gz: c676db445de768fa69a52a0e81dcc296c591580f7f1b651d29beb081f424b482c11a6650ba2873805679807a739057785c9cbba6a28e1d0b261166aaf3d4e025

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 7
-  BUGFIX = 36
+  BUGFIX = 37
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen/application/lsf.rb

@@ -84,7 +84,6 @@ module Origen
             puts cmd
             '496212'  # Return a dummy ID to keep the caller happy
           else
-            # puts cmd
             output = `#{cmd}`
             Origen.log.info output.strip
             if output.split("\n").last =~ /Job <(\d+)> is submitted/
@@ -130,13 +129,16 @@ module Origen
       # to warn if a single users current job count gets above 500.
       # This method prevents that stage from being reached.
       def limit_job_submissions
-        if remote_jobs_count > 450
+        @local_job_count ||= 0
+        if @local_job_count == 100
           while remote_jobs_count > 400
             puts 'Waiting for submitted jobs count to fall below limit...'
             sleep 5
           end
+          @local_job_count = 0
           yield
         else
+          @local_job_count += 1
           yield
         end
       end

data/lib/origen/application/runner.rb

@@ -25,8 +25,21 @@ module Origen
             record_invocation(options) do
               prepare_for_lsf
               Origen.app.listeners_for(:before_lsf_submission).each(&:before_lsf_submission)
+              batch = []
               expand_lists_and_directories(options[:files], options).each do |file|
-                Origen.app.lsf_manager.submit_origen_job(file, options)
+                if options[:batch]
+                  # Batch jobs into groups of 10
+                  batch << file
+                  if batch.size == options[:batch]
+                    Origen.app.lsf_manager.submit_origen_job(batch.join(' '), options)
+                    batch = []
+                  end
+                else
+                  Origen.app.lsf_manager.submit_origen_job(file, options)
+                end
+              end
+              if options[:batch]
+                Origen.app.lsf_manager.submit_origen_job(batch.join(' '), options) unless batch.empty?
               end
             end
             Origen.log.info ''

data/lib/origen/registers/reg.rb

@@ -971,6 +971,7 @@ module Origen
       #   reg(:control).bit(1)                  # => Returns a BitCollection containing status bit
       #   reg(:control).bit(1,2)                # => Returns a BitCollection containing both status bits
       def bit(*args)
+        multi_bit_names = false
         # return get_bits_with_constraint(nil,:default) if args.size == 0
         constraint = extract_feature_params(args)
         if constraint.nil?
@@ -994,8 +995,8 @@ module Origen
                 collection << get_bits_with_constraint(bit_number, constraint)
               end
             else
+              multi_bit_names = args.size > 1
               # Reaches here if bit name is specified
-
               if @lookup.include?(arg_item)
                 split_bits = false
                 @lookup.each { |_k, v| split_bits = true if v.is_a? Array }
@@ -1022,6 +1023,9 @@ module Origen
           end
           nil
         else
+          if multi_bit_names
+            collection.sort_by!(&:position)
+          end
           collection
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.36
+  version: 0.7.37
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -568,7 +568,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit