origen 0.34.2 → 0.34.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/version.rb +1 -1
- data/lib/origen/application/lsf.rb +25 -6
- data/origen_site_config.yml +7 -1
- metadata +3 -6
- data/vendor/lib/models/origen/export1.rb +0 -77
- data/vendor/lib/models/origen/export1/block1.rb +0 -13
- data/vendor/lib/models/origen/export1/block1/x.rb +0 -27
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fb9589bd8d0179a20919b1adf594cd400fa7f882
|
|
4
|
+
data.tar.gz: e898d8031d277cc479d1c84ebc36c775f15b419e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 54571cf52125b281cd1613800dde84b6c8ddb639076b7dd89328ebaed4c32e6d3e45c27723b4fb7b179c72ca59d278f986ff7b8b3da721542e27d06483fb7fa8
|
|
7
|
+
data.tar.gz: fefb815678df5803d5f9f6b76de81ce52254455c3b7fd2a1e7d47e475bf99c98ac41611abbcd8a48fc1bffc765b76c8fdd7d4d4a63015a55dffcb9254631ac7a
|
data/config/version.rb
CHANGED
|
@@ -18,13 +18,30 @@ module Origen
|
|
|
18
18
|
# When set to true no submissions will be made to LSF and instead the
|
|
19
19
|
# command that would have been submitted is printed to the terminal instead
|
|
20
20
|
attr_accessor :debug
|
|
21
|
+
# Specify the number of cores to use while submitting the job to LSF
|
|
22
|
+
# There is a restriction on the number of cores available per queue name
|
|
23
|
+
# Below is a table:
|
|
24
|
+
# Queue name equivalent Purpose
|
|
25
|
+
# interq gui Interactive jobs, like Virtuoso. Max 15 jobs/user
|
|
26
|
+
# batchq normal CPU intensive batch jobs, 1 .. 3 threads. Specify # of threads with bsub -n option. Slots/user: ~10% of total batch capacity.
|
|
27
|
+
# batchq_mt normal CPU intensive batch jobs, >= 4 threads. Specify # of threads with bsub -n option. Slots: shared with batchq.
|
|
28
|
+
# shortq short CPU intensive batch jobs, 1 thread (= 1 core), guaranteed run time 15 minutes. Slots/user: approximately 3x limit in batchq.
|
|
29
|
+
# offloadq - Used for offloading cpu intensive batch jobs to cloud, see CloudPortal.
|
|
30
|
+
# Do not submit directly into this queue. No real slot limit. Focused on CPU intensive jobs, not using much memory/data.
|
|
31
|
+
# distributed normal Run jobs than span multiple hosts.
|
|
32
|
+
# - prio High prio queue with low slot count, useful if you don't have slots available in normal queue. See PrioritizingMyJobs.
|
|
33
|
+
# - ondemand On-Demand Servers to satisfy urgent and short-term (2 weeks or less) customer compute requirements.
|
|
34
|
+
# - wam WAM cron processing
|
|
35
|
+
# - grid Low-priority batch jobs (random sim, regressions, etc). Access to all spare CPU cycles.
|
|
36
|
+
attr_accessor :cores
|
|
21
37
|
|
|
22
38
|
def initialize
|
|
23
|
-
@group =
|
|
24
|
-
@project =
|
|
25
|
-
@resource =
|
|
26
|
-
@queue =
|
|
27
|
-
@debug =
|
|
39
|
+
@group = Origen.site_config.lsf_group
|
|
40
|
+
@project = Origen.site_config.lsf_project
|
|
41
|
+
@resource = Origen.site_config.lsf_resource
|
|
42
|
+
@queue = Origen.site_config.lsf_queue
|
|
43
|
+
@debug = Origen.site_config.lsf_debug
|
|
44
|
+
@cores = Origen.site_config.lsf_cores
|
|
28
45
|
end
|
|
29
46
|
end
|
|
30
47
|
|
|
@@ -74,6 +91,8 @@ module Origen
|
|
|
74
91
|
resource = resource ? "-R '#{resource}'" : ''
|
|
75
92
|
queue = options[:queue] || config.queue
|
|
76
93
|
queue = queue ? "-q #{queue}" : ''
|
|
94
|
+
cores = options[:cores] || config.cores
|
|
95
|
+
cores = cores ? "-n #{cores}" : ''
|
|
77
96
|
rerunnable = options[:rerunnable] ? '-r' : ''
|
|
78
97
|
if options[:dependents].empty?
|
|
79
98
|
dependents = ''
|
|
@@ -81,7 +100,7 @@ module Origen
|
|
|
81
100
|
dependents = options[:dependents].map { |id| "ended(#{id})" }.join(' && ')
|
|
82
101
|
dependents = "-w '#{dependents}'"
|
|
83
102
|
end
|
|
84
|
-
cmd = "bsub -oo /dev/null #{dependents} #{rerunnable} #{group} #{project} #{resource} #{queue} '#{command}'"
|
|
103
|
+
cmd = "bsub -oo /dev/null #{dependents} #{rerunnable} #{group} #{project} #{resource} #{queue} #{cores} '#{command}'"
|
|
85
104
|
if config.debug
|
|
86
105
|
puts cmd
|
|
87
106
|
'496212' # Return a dummy ID to keep the caller happy
|
data/origen_site_config.yml
CHANGED
|
@@ -95,4 +95,10 @@ gem_use_from_system:
|
|
|
95
95
|
# Optional to override the name given to the user ID attribute on the LDAP system ('id' by default)
|
|
96
96
|
#ldap_user_id_attribute: uid
|
|
97
97
|
|
|
98
|
-
# LSF
|
|
98
|
+
# LSF Configuration
|
|
99
|
+
lsf_queue: 'batchq'
|
|
100
|
+
lsf_group: 'nil'
|
|
101
|
+
lsf_project: 'msg.te'
|
|
102
|
+
lsf_resource: 'rhel6'
|
|
103
|
+
lsf_cores: '1'
|
|
104
|
+
lsf_debug: 'false'
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: origen
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.34.
|
|
4
|
+
version: 0.34.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Stephen McGinty
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-08-
|
|
11
|
+
date: 2018-08-17 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activesupport
|
|
@@ -635,9 +635,6 @@ files:
|
|
|
635
635
|
- templates/shared/web/_logo.html
|
|
636
636
|
- templates/time/filter.rb.erb
|
|
637
637
|
- templates/time/rules.rb.erb
|
|
638
|
-
- vendor/lib/models/origen/export1.rb
|
|
639
|
-
- vendor/lib/models/origen/export1/block1.rb
|
|
640
|
-
- vendor/lib/models/origen/export1/block1/x.rb
|
|
641
638
|
homepage: http://origen-sdk.org
|
|
642
639
|
licenses:
|
|
643
640
|
- MIT
|
|
@@ -658,7 +655,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
658
655
|
version: 1.8.11
|
|
659
656
|
requirements: []
|
|
660
657
|
rubyforge_project:
|
|
661
|
-
rubygems_version: 2.6.
|
|
658
|
+
rubygems_version: 2.6.13
|
|
662
659
|
signing_key:
|
|
663
660
|
specification_version: 4
|
|
664
661
|
summary: The Semiconductor Developer's Kit
|
|
@@ -1,77 +0,0 @@
|
|
|
1
|
-
# This file was generated by Origen, any hand edits will likely get overwritten
|
|
2
|
-
# rubocop:disable all
|
|
3
|
-
module Origen
|
|
4
|
-
module Export1
|
|
5
|
-
def self.extended(model)
|
|
6
|
-
model.add_package :bga
|
|
7
|
-
model.add_package :pcs
|
|
8
|
-
model.add_pin :pinx
|
|
9
|
-
model.add_pin :piny, reset: :drive_hi, direction: :output, meta: { a: '1', b: 2 }
|
|
10
|
-
model.add_pin :tdo, packages: { bga: { location: 'BF32', dib_assignment: [10104] }, pcs: { location: 'BF30', dib_assignment: [31808] } }
|
|
11
|
-
model.add_pin :porta31
|
|
12
|
-
model.add_pin :porta30
|
|
13
|
-
model.add_pin :porta29
|
|
14
|
-
model.add_pin :porta28
|
|
15
|
-
model.add_pin :porta27
|
|
16
|
-
model.add_pin :porta26
|
|
17
|
-
model.add_pin :porta25
|
|
18
|
-
model.add_pin :porta24
|
|
19
|
-
model.add_pin :porta23
|
|
20
|
-
model.add_pin :porta22
|
|
21
|
-
model.add_pin :porta21
|
|
22
|
-
model.add_pin :porta20
|
|
23
|
-
model.add_pin :porta19
|
|
24
|
-
model.add_pin :porta18
|
|
25
|
-
model.add_pin :porta17
|
|
26
|
-
model.add_pin :porta16
|
|
27
|
-
model.add_pin :porta15
|
|
28
|
-
model.add_pin :porta14
|
|
29
|
-
model.add_pin :porta13
|
|
30
|
-
model.add_pin :porta12
|
|
31
|
-
model.add_pin :porta11
|
|
32
|
-
model.add_pin :porta10
|
|
33
|
-
model.add_pin :porta9
|
|
34
|
-
model.add_pin :porta8
|
|
35
|
-
model.add_pin :porta7
|
|
36
|
-
model.add_pin :porta6
|
|
37
|
-
model.add_pin :porta5
|
|
38
|
-
model.add_pin :porta4
|
|
39
|
-
model.add_pin :porta3
|
|
40
|
-
model.add_pin :porta2
|
|
41
|
-
model.add_pin :porta1
|
|
42
|
-
model.add_pin :porta0
|
|
43
|
-
model.add_pin :portb0
|
|
44
|
-
model.add_pin :portb1
|
|
45
|
-
model.add_pin :portb2
|
|
46
|
-
model.add_pin :portb3
|
|
47
|
-
model.add_pin :portb4
|
|
48
|
-
model.add_pin :portb5
|
|
49
|
-
model.add_pin :portb6
|
|
50
|
-
model.add_pin :portb7
|
|
51
|
-
model.add_pin :portb8
|
|
52
|
-
model.add_pin :portb9
|
|
53
|
-
model.add_pin :portb10
|
|
54
|
-
model.add_pin :portb11
|
|
55
|
-
model.add_pin :portb12
|
|
56
|
-
model.add_pin :portb13
|
|
57
|
-
model.add_pin :portb14
|
|
58
|
-
model.add_pin :portb15
|
|
59
|
-
model.add_pin_group :porta, :porta31, :porta30, :porta29, :porta28, :porta27, :porta26, :porta25, :porta24, :porta23, :porta22, :porta21, :porta20, :porta19, :porta18, :porta17, :porta16, :porta15, :porta14, :porta13, :porta12, :porta11, :porta10, :porta9, :porta8, :porta7, :porta6, :porta5, :porta4, :porta3, :porta2, :porta1, :porta0
|
|
60
|
-
model.add_pin_group :portb, :portb15, :portb14, :portb13, :portb12, :portb11, :portb10, :portb9, :portb8, :portb7, :portb6, :portb5, :portb4, :portb3, :portb2, :portb1, :portb0
|
|
61
|
-
model.pins(:portb).endian = :little
|
|
62
|
-
model.add_power_pin :vdd1, voltage: 3, current_limit: 0.05, meta: { min_voltage: 1.5 }
|
|
63
|
-
model.add_power_pin :vdd2
|
|
64
|
-
model.add_power_pin_group :vdd, :vdd1, :vdd2
|
|
65
|
-
model.add_ground_pin :gnd1
|
|
66
|
-
model.add_ground_pin :gnd2
|
|
67
|
-
model.add_ground_pin :gnd3
|
|
68
|
-
model.add_ground_pin_group :gnd, :gnd1, :gnd2, :gnd3
|
|
69
|
-
model.add_virtual_pin :relay1
|
|
70
|
-
model.add_virtual_pin :relay2, packages: { bga: {} }
|
|
71
|
-
|
|
72
|
-
model.sub_block :block1, file: 'origen/export1/block1.rb', dir: '/home/stephen/Code/github/origen/vendor/lib/models', lazy: true
|
|
73
|
-
|
|
74
|
-
end
|
|
75
|
-
end
|
|
76
|
-
end
|
|
77
|
-
# rubocop:enable all
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
# This file was generated by Origen, any hand edits will likely get overwritten
|
|
2
|
-
# rubocop:disable all
|
|
3
|
-
module Origen
|
|
4
|
-
module Export1
|
|
5
|
-
module Block1
|
|
6
|
-
def self.extended(model)
|
|
7
|
-
model.sub_block :x, file: 'origen/export1/block1/x.rb', dir: '/home/stephen/Code/github/origen/vendor/lib/models', lazy: true, base_address: 0x40000000
|
|
8
|
-
|
|
9
|
-
end
|
|
10
|
-
end
|
|
11
|
-
end
|
|
12
|
-
end
|
|
13
|
-
# rubocop:enable all
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
# This file was generated by Origen, any hand edits will likely get overwritten
|
|
2
|
-
# rubocop:disable all
|
|
3
|
-
module Origen
|
|
4
|
-
module Export1
|
|
5
|
-
module Block1
|
|
6
|
-
module X
|
|
7
|
-
def self.extended(model)
|
|
8
|
-
# ** Some Control Register **
|
|
9
|
-
# Blah, blah,
|
|
10
|
-
# and some more blah
|
|
11
|
-
model.add_reg :ctrl, 0x24, size: 16 do |reg|
|
|
12
|
-
reg.bit 7, :coco, access: :ro
|
|
13
|
-
reg.bit 6, :aien
|
|
14
|
-
# **Some Diff Bit** - This is a...
|
|
15
|
-
# blah, blah
|
|
16
|
-
#
|
|
17
|
-
# 0 | It's off
|
|
18
|
-
# 1 | It's on
|
|
19
|
-
reg.bit 5, :diff
|
|
20
|
-
reg.bit 4..0, :adch, reset: 0x1F
|
|
21
|
-
end
|
|
22
|
-
end
|
|
23
|
-
end
|
|
24
|
-
end
|
|
25
|
-
end
|
|
26
|
-
end
|
|
27
|
-
# rubocop:enable all
|