Skip to content

Commit

Permalink
Merge pull request #11 from LFL-Lab/update-docs-and-readme
Browse files Browse the repository at this point in the history
Update docs and readme for docsite master
  • Loading branch information
shanto268 authored Jun 11, 2024
2 parents a63354b + 304509b commit bec9188
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 45 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<img src="docs/_static/images/squadds_not_transparent.png" width="100%" alt="SQuADDS Logo" /> <!-- This will stretch the logo to the full container width -->
</center>

# ![Alpha Version](https://img.shields.io/badge/Status-Alpha%20Version-yellow) Superconducting Qubit And Device Design and Simulation database
# ![Alpha Version](https://img.shields.io/badge/Status-Alpha%20Version-yellow) ![Build Status](https://img.shields.io/github/actions/workflow/status/LFL-Lab/SQuADDS/ci.yml?branch=master) ![License](https://img.shields.io/github/license/LFL-Lab/SQuADDS) ![Version](https://img.shields.io/github/v/release/LFL-Lab/SQuADDS) Superconducting Qubit And Device Design and Simulation database

> :warning: **This project is an alpha release and currently under active development. Some features and documentation may be incomplete. Please update to the latest release.**
Expand Down
2 changes: 1 addition & 1 deletion docs/source/developer/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Contribution Items
| **Implementation of Next Release** - If you would like to help in implementing the next version of SQuADDS, please look at what is being worked on for the `next release <https://github.com/shanto268/SQuADDS?tab=readme-ov-file#next-release>`_
Please see our `Contributing Guidelines <https://github.com/LFL-Lab/SQuADDS/CONTRIBUTING.md>`_ for more information on how to get started.
Please see our `Contributing Guidelines <https://github.com/LFL-Lab/SQuADDS/blob/master/CONTRIBUTING.md>`_ for more information on how to get started.

.. note::

Expand Down
90 changes: 47 additions & 43 deletions docs/source/resources/palace.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,83 +18,86 @@ Follow these steps to ensure a smooth installation process. It was tested to wor

Use Homebrew to install the required dependencies for Palace. Run the following commands in your terminal:

```sh
brew update
brew install cmake git open-mpi libuv lapack openblas llvm gcc@12
```
.. code-block:: sh
brew update
brew install cmake git open-mpi libuv lapack openblas llvm gcc@12
2. **Set Up Environment Variables**

To use Clang provided by LLVM instead of the default macOS Clang, and to set up other necessary paths, add the following to your `~/.zshrc` or `~/.bashrc` file:

```sh
export PATH=/opt/homebrew/opt/llvm/bin:/opt/homebrew/bin:$PATH
export LIBRARY_PATH=/opt/homebrew/lib:/opt/homebrew/opt/llvm/lib
export LD_LIBRARY_PATH=/opt/homebrew/lib:/opt/homebrew/opt/llvm/lib
export OPENBLASROOT=/opt/homebrew/opt/openblas
.. code-block:: sh
export PATH=/opt/homebrew/opt/llvm/bin:/opt/homebrew/bin:$PATH
export LIBRARY_PATH=/opt/homebrew/lib:/opt/homebrew/opt/llvm/lib
export LD_LIBRARY_PATH=/opt/homebrew/lib:/opt/homebrew/opt/llvm/lib
export OPENBLASROOT=/opt/homebrew/opt/openblas
export CC=/opt/homebrew/opt/llvm/bin/clang
export CXX=/opt/homebrew/opt/llvm/bin/clang++
export FC=gfortran
```
export CC=/opt/homebrew/opt/llvm/bin/clang
export CXX=/opt/homebrew/opt/llvm/bin/clang++
export FC=gfortran
Then, source the updated configuration:

```sh
source ~/.zshrc # or source ~/.bashrc
```
.. code-block:: sh
source ~/.zshrc # or source ~/.bashrc
3. **Clone the Palace Repository**

Clone the Palace repository from GitHub to your local machine:

```sh
git clone --recurse-submodules https://github.com/awslabs/palace.git
cd palace
```
.. code-block:: sh
git clone --recurse-submodules https://github.com/awslabs/palace.git
cd palace
4. **Set Up the Build Environment**

Create a build directory and navigate to it:

```sh
mkdir build
cd build
```
.. code-block:: sh
mkdir build
cd build
5. **Configure the Build**

Use CMake to configure the build environment, specifying the paths to the BLAS and LAPACK libraries:

```sh
cmake .. -DCMAKE_BUILD_TYPE=Release -DBLAS_LIBRARIES=/opt/homebrew/opt/openblas/lib/libopenblas.dylib -DLAPACK_LIBRARIES=/opt/homebrew/opt/lapack/lib/liblapack.dylib
```
.. code-block:: sh
cmake .. -DCMAKE_BUILD_TYPE=Release -DBLAS_LIBRARIES=/opt/homebrew/opt/openblas/lib/libopenblas.dylib -DLAPACK_LIBRARIES=/opt/homebrew/opt/lapack/lib/liblapack.dylib
6. **Build Palace**

Compile the Palace software using the make command:

```sh
make -j$(sysctl -n hw.ncpu)
```
.. code-block:: sh
make -j$(sysctl -n hw.ncpu)
7. **Update Your Path**

Add the Palace executable to your PATH by adding the following line to your `~/.zshrc` or `~/.bashrc` file:

```sh
export PATH="/path/to/palace/build/bin:$PATH"
```
.. code-block:: sh
export PATH="/path/to/palace/build/bin:$PATH"
Replace `/path/to/palace/build/bin` with the actual path to the `bin` directory in your Palace build directory.

8. **Verify the Installation**

To verify that Palace is installed correctly, open a new terminal session and run:

```sh
palace
```
.. code-block:: sh
palace
If the command runs without errors, your installation is successful.


If the command runs without errors, your installation is successful.

Expand All @@ -109,7 +112,8 @@ Follow these steps for installation:

1. Run the following script to install the required dependencies:

```sh
.. code-block:: sh
#!/bin/bash
# Update and upgrade packages
Expand All @@ -124,11 +128,11 @@ Follow these steps for installation:
# Install Palace prerequisites
sudo apt-get install pkg-config build-essential cmake python3 mpi-default-dev
```
2. Run the following script to install Spack, set up MPI, and build Palace:

```sh
.. code-block:: sh
#!/bin/bash
# This script will:
Expand Down Expand Up @@ -176,9 +180,9 @@ Follow these steps for installation:
After running these scripts, you should be able to launch Palace by running:
```sh
$ palace
```
.. code-block:: sh
$ palace
If no errors are encountered, your installation is likely successful.
Expand Down Expand Up @@ -240,4 +244,4 @@ After building, place all dependent dynamic libraries (``*.dll`` files) together
We have open-sourced the building files for Palace, shared at `https://github.com/WelSimLLC/palace <https://github.com/WelSimLLC/palace>`_, and provided the compiled ``palace.exe`` executable file for users to use directly.
You may need to ``C:\Program Files\Microsoft Visual Studio\{Year}\{Licence}\VC\Redist\MSVC\v{version}\vc_redist.x64.exe`` to run the executable program and restart the program.
You may need to ``C:\Program Files\Microsoft Visual Studio\{Year}\{Licence}\VC\Redist\MSVC\v{version}\vc_redist.x64.exe`` to run the executable program and restart the program.

0 comments on commit bec9188

Please sign in to comment.