Skip to content

Commit

Permalink
Fixing some ruby linting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
FaragElsayed2 committed Feb 8, 2023
1 parent 0f7bf08 commit 9f22fa4
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 11 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ on:
jobs:
lint_python:
runs-on: ubuntu-latest
strategy:
max-parallel: 12
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -33,12 +31,10 @@ jobs:
lint_ruby:
runs-on: ubuntu-latest
strategy:
max-parallel: 12
steps:
- uses: actions/checkout@v3
with:
submodules: 'recursive'
- name: Lint with rubocop
run: |
make lint_ruby
make lint_ruby
3 changes: 0 additions & 3 deletions .github/workflows/regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ jobs:
needs: build_drc-matrix
runs-on: ubuntu-latest
strategy:
max-parallel: 4
fail-fast: false
matrix:
part: [drc]
Expand All @@ -64,7 +63,6 @@ jobs:
drc_switch:
runs-on: ubuntu-latest
strategy:
max-parallel: 4
fail-fast: false
matrix:
include:
Expand All @@ -83,7 +81,6 @@ jobs:
lvs_regression:
runs-on: ubuntu-latest
strategy:
max-parallel: 4
fail-fast: false
matrix:
include:
Expand Down
29 changes: 27 additions & 2 deletions klayout/drc/rule_decks/main.drc
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,12 @@ OFFGRID = $offgrid != 'false'
logger.info("Offgrid enabled: #{OFFGRID}")

# threads
$thr ||= Etc.nprocessors
threads($thr)
if $thr
threads($thr)
else
thr ||= Etc.nprocessors
threads(thr)
end

logger.info("Number of threads to use #{$thr}")

Expand Down Expand Up @@ -508,23 +512,29 @@ metal2_drawn = get_polygons(36, 0)
count = metal2_drawn.count
logger.info("metal2_drawn has #{count} polygons")
polygons_count += count

metal2_dummy = get_polygons(36, 4)
count = metal2_dummy.count
logger.info("metal2_dummy has #{count} polygons")
polygons_count += count

metal2 = metal2_drawn + metal2_dummy

metal2_label = get_polygons(36, 10)
count = metal2_label.count
logger.info("metal2_label has #{count} polygons")
polygons_count += count

metal2_slot = get_polygons(36, 3)
count = metal2_slot.count
logger.info("metal2_slot has #{count} polygons")
polygons_count += count

metal2_blk = get_polygons(36, 5)
count = metal2_blk.count
logger.info("metal2_blk has #{count} polygons")
polygons_count += count

if METAL_LEVEL == '2LM'

top_via = via1
Expand All @@ -543,23 +553,29 @@ else
count = metal3_drawn.count
logger.info("metal3_drawn has #{count} polygons")
polygons_count += count

metal3_dummy = get_polygons(42, 4)
count = metal3_dummy.count
logger.info("metal3_dummy has #{count} polygons")
polygons_count += count

metal3 = metal3_drawn + metal3_dummy

metal3_label = get_polygons(42, 10)
count = metal3_label.count
logger.info("metal3_label has #{count} polygons")
polygons_count += count

metal3_slot = get_polygons(42, 3)
count = metal3_slot.count
logger.info("metal3_slot has #{count} polygons")
polygons_count += count

metal3_blk = get_polygons(42, 5)
count = metal3_blk.count
logger.info("metal3_blk has #{count} polygons")
polygons_count += count

if METAL_LEVEL == '3LM'

top_via = via2
Expand All @@ -569,28 +585,37 @@ else
else

via3 = get_polygons(40, 0)
count = via3.count
logger.info("via3 has #{count} polygons")
polygons_count += count

metal4_drawn = get_polygons(46, 0)
count = metal4_drawn.count
logger.info("metal4_drawn has #{count} polygons")
polygons_count += count

metal4_dummy = get_polygons(46, 4)
count = metal4_dummy.count
logger.info("metal4_dummy has #{count} polygons")
polygons_count += count

metal4 = metal4_drawn + metal4_dummy

metal4_label = get_polygons(46, 10)
count = metal4_label.count
logger.info("metal4_label has #{count} polygons")
polygons_count += count

metal4_slot = get_polygons(46, 3)
count = metal4_slot.count
logger.info("metal4_slot has #{count} polygons")
polygons_count += count

metal4_blk = get_polygons(46, 5)
count = metal4_blk.count
logger.info("metal4_blk has #{count} polygons")
polygons_count += count

if METAL_LEVEL == '4LM'

top_via = via3
Expand Down
2 changes: 1 addition & 1 deletion pdk_regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ dependencies:
- ruby
- pip
- pip:
- -r requirements.txt
- -r requirements.txt

0 comments on commit 9f22fa4

Please sign in to comment.