From 01686a20050a2ff4e9559a92558682183a9a09ef Mon Sep 17 00:00:00 2001 From: Harald Pretl Date: Thu, 26 Jun 2025 21:21:06 +0200 Subject: [PATCH] Switch from `volare` to `ciel` --- .gitignore | 2 +- Makefile | 22 +++++++++++----------- docs/source/basic_setup.md | 2 +- requirements.txt | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 648df3b9..a46b5394 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,4 @@ gf180mcuD skywater-pdk/ sky130_fd_bd_sram/ docker/openram-ubuntu.log -volare/ +ciel/ diff --git a/Makefile b/Makefile index db28296e..802ac68d 100644 --- a/Makefile +++ b/Makefile @@ -18,11 +18,11 @@ SRAM_LIB_GIT_COMMIT ?= dd64256961317205343a3fd446908b42bafba388 SKY130_PDK ?= $(PDK_ROOT)/sky130A GF180_PDK ?= $(PDK_ROOT)/gf180mcuD -# Volare SKY130 PDK -SKY130_VOLARE = e8294524e5f67c533c5d0c3afa0bcc5b2a5fa066 # 2022.07.29 +# Ciel SKY130 PDK +SKY130_CIEL = e8294524e5f67c533c5d0c3afa0bcc5b2a5fa066 # 2022.07.29 -# Volare GF180 PDK -GF180_VOLARE = cd1748bb197f9b7af62a54507de6624e30363943 # 2023.12.04 +# Ciel GF180 PDK +GF180_CIEL = cd1748bb197f9b7af62a54507de6624e30363943 # 2023.12.04 # Skywater PDK SKY130_PDKS_DIR ?= $(PDK_ROOT)/skywater-pdk @@ -58,7 +58,7 @@ INSTALL_BASE_DIRS := gds_lib mag_lib sp_lib lvs_lib calibre_lvs_lib klayout_lvs_ INSTALL_BASE := $(OPENRAM_HOME)/../technology/sky130 INSTALL_DIRS := $(addprefix $(INSTALL_BASE)/,$(INSTALL_BASE_DIRS)) -# If conda is installed, we will use volare from there +# If conda is installed, we will use ciel from there CONDA_DIR := $(wildcard $(TOP_DIR)/miniconda) check-pdk-root: @@ -102,23 +102,23 @@ sky130-install: $(SRAM_LIB_DIR) .PHONY: sky130-install sky130-pdk: $(SKY130_PDKS_DIR) - @echo "Installing SKY130 via volare..." + @echo "Installing SKY130 via ciel..." ifeq ($(CONDA_DIR),) - volare enable --pdk sky130 $(SKY130_VOLARE) + ciel enable --pdk sky130 $(SKY130_CIEL) else source $(TOP_DIR)/miniconda/bin/activate && \ - volare enable --pdk sky130 $(SKY130_VOLARE) && \ + ciel enable --pdk sky130 $(SKY130_CIEL) && \ conda deactivate endif .PHONY: sky130-pdk gf180mcu-pdk: - @echo "Installing GF180 via volare..." + @echo "Installing GF180 via ciel..." ifeq ($(CONDA_DIR),) - volare enable --pdk gf180mcu $(GF180_VOLARE) + ciel enable --pdk gf180mcu $(GF180_CIEL) else source $(TOP_DIR)/miniconda/bin/activate && \ - volare enable --pdk gf180mcu $(GF180_VOLARE) && \ + ciel enable --pdk gf180mcu $(GF180_CIEL) && \ conda deactivate endif .PHONY: gf180mcu-pdk diff --git a/docs/source/basic_setup.md b/docs/source/basic_setup.md index 42e3117f..e184754b 100644 --- a/docs/source/basic_setup.md +++ b/docs/source/basic_setup.md @@ -122,7 +122,7 @@ cd $HOME/OpenRAM make sky130-pdk ``` -This will use volare to get the PDK. +This will use ciel to get the PDK. > **Note**: If you don't have Magic installed, you need to install and activate > the conda environment before running this command. You can run: diff --git a/requirements.txt b/requirements.txt index 5dd98a90..06ff17c6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,4 @@ scipy>=1.3.3 numpy>=1.17.4 python-subunit>=1.4.0 unittest2>=1.1.0 -volare>=0.15.2 +ciel>=2.0.0