From 9f22fa4e14951d44c6c18108af18c0fe6c5c2365 Mon Sep 17 00:00:00 2001
From: FaragElsayed2 <farag_agoor@mabrains.com>
Date: Wed, 8 Feb 2023 10:26:10 +0200
Subject: [PATCH] Fixing some ruby linting issues

---
 .github/workflows/linting.yml    |  6 +-----
 .github/workflows/regression.yml |  3 ---
 klayout/drc/rule_decks/main.drc  | 29 +++++++++++++++++++++++++++--
 pdk_regression.yml               |  2 +-
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index a7968593..f5578329 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -21,8 +21,6 @@ on:
 jobs:
   lint_python:
     runs-on: ubuntu-latest
-    strategy:
-      max-parallel: 12
     steps:
       - uses: actions/checkout@v3
         with:
@@ -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
\ No newline at end of file
+          make lint_ruby
diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
index 6b7678f0..e222aae4 100644
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -45,7 +45,6 @@ jobs:
     needs: build_drc-matrix
     runs-on: ubuntu-latest
     strategy:
-      max-parallel: 4
       fail-fast: false
       matrix:
         part: [drc]
@@ -64,7 +63,6 @@ jobs:
   drc_switch:
     runs-on: ubuntu-latest
     strategy:
-      max-parallel: 4
       fail-fast: false
       matrix:
         include:
@@ -83,7 +81,6 @@ jobs:
   lvs_regression:
     runs-on: ubuntu-latest
     strategy:
-      max-parallel: 4
       fail-fast: false
       matrix:
         include:
diff --git a/klayout/drc/rule_decks/main.drc b/klayout/drc/rule_decks/main.drc
index 3df87baf..56a3b256 100644
--- a/klayout/drc/rule_decks/main.drc
+++ b/klayout/drc/rule_decks/main.drc
@@ -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}")
 
@@ -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
@@ -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
@@ -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
diff --git a/pdk_regression.yml b/pdk_regression.yml
index ad29e5bb..d5216abb 100644
--- a/pdk_regression.yml
+++ b/pdk_regression.yml
@@ -8,4 +8,4 @@ dependencies:
   - ruby
   - pip
   - pip:
-    - -r requirements.txt
\ No newline at end of file
+    - -r requirements.txt