Skip to content

Commit

Permalink
Updated version number, and other minor changes in license header
Browse files Browse the repository at this point in the history
  • Loading branch information
lluisalemanypuig committed Sep 30, 2024
1 parent f941cf4 commit c1972c0
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion compare_versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
###########################################################################
#
# SWIG-generated python wrapper for the Linear Arrangement Library
# Copyright (C) 2021-2023 LAL-project developers
# Copyright (C) 2021 - 2024 LAL-project developers
# Lluís Alemany Puig
#
# This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
###########################################################################
#
# SWIG-generated python wrapper for the Linear Arrangement Library
# Copyright (C) 2021-2023 LAL-project developers
# Copyright (C) 2021 - 2024 LAL-project developers
# Lluís Alemany Puig
#
# This program is free software: you can redistribute it and/or modify
Expand Down
10 changes: 5 additions & 5 deletions instructions/installation-python-interface-macos-sources.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Users need to install the following dependencies.

### LAL

Install LAL either from binaries or sources (see the [main README file](https://github.com/LAL-project/linear-arrangement-library/blob/master/README.md)).
Install LAL either from binaries or sources (see the [main README file](https://github.com/LAL-project/linear-arrangement-library/tree/24.10/README.md)).

### Python3

Expand Down Expand Up @@ -59,7 +59,7 @@ In order to compile the interface, you have to configure one of the build files

### Location of LAL

First of all, modify the variables `LAL_INC_DIR` and `LAL_LIB_DIR` with the location of LAL's header files and LAL's binary files in [`Makefile.lalsource`](https://github.com/LAL-project/python-interface/blob/main/Makefile.lalsource). For example,
First of all, modify the variables `LAL_INC_DIR` and `LAL_LIB_DIR` with the location of LAL's header files and LAL's binary files in [`Makefile.lalsource`](https://github.com/LAL-project/python-interface/tree/24.10/Makefile.lalsource). For example,

# ----------------
# MACOS USERS ONLY
Expand All @@ -73,7 +73,7 @@ First of all, modify the variables `LAL_INC_DIR` and `LAL_LIB_DIR` with the loca

### Location of Python sources and libraries

Secondly, specify the version of Python against which the interface is linked in [`Makefile.pythonsource`](https://github.com/LAL-project/python-interface/blob/main/Makefile.pythonsource). Indicate where Python's header files are located at, and where to find the binaries. To do this, modify the variables `PYTHON_INC_DIR` and `PYTHON_LIB_DIR`. The default values are the following
Secondly, specify the version of Python against which the interface is linked in [`Makefile.pythonsource`](https://github.com/LAL-project/python-interface/tree/24.10/Makefile.pythonsource). Indicate where Python's header files are located at, and where to find the binaries. To do this, modify the variables `PYTHON_INC_DIR` and `PYTHON_LIB_DIR`. The default values are the following

# Python 3 include dir
PYTHON_INC_DIR = /usr/include/python3.$(MINOR_VERSION_PYTHON)
Expand All @@ -91,7 +91,7 @@ Users who installed *anaconda* may want to change the values for:

### Destination of LAL's python wrapper

Also in [`Makefile.pythonsource`](https://github.com/LAL-project/python-interface/blob/main/Makefile.pythonsource), users can also choose the destination directory of LAL's python interface by modifing the variable `LAL_PY_DEST`. The default value is
Also in [`Makefile.pythonsource`](https://github.com/LAL-project/python-interface/tree/24.10/Makefile.pythonsource), users can also choose the destination directory of LAL's python interface by modifing the variable `LAL_PY_DEST`. The default value is

# Directory where LAL's interface will be installed to
LAL_PY_DEST = /usr/local/lib/python3.$(MINOR_VERSION_PYTHON)/dist-packages
Expand All @@ -103,7 +103,7 @@ Users who wish to install LAL into *anaconda*'s installation directory may want

### Compiler

Last but not least, users must specify which compiler is to be used in [`Makefile`](https://github.com/LAL-project/python-interface/blob/main/Makefile). One requirement is that the compiler used must have support for `C++17`'s standard.
Last but not least, users must specify which compiler is to be used in [`Makefile`](https://github.com/LAL-project/python-interface/tree/24.10/Makefile). One requirement is that the compiler used must have support for `C++17`'s standard.

CXX = /usr/local/Cellar/gcc/11.2.0/bin/g++-11

Expand Down
6 changes: 3 additions & 3 deletions instructions/installation-python-interface-ubuntu-sources.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ All the instructions below require the use of a command-line terminal. Head over

### LAL

Install LAL either from binaries or sources (see the [main README file](https://github.com/LAL-project/linear-arrangement-library/blob/master/README.md)) of that project.
Install LAL either from binaries or sources (see the [main README file](https://github.com/LAL-project/linear-arrangement-library/tree/24.10/README.md)) of that project.

### Python3

Expand Down Expand Up @@ -54,7 +54,7 @@ In order to compile the interface, you have to configure two build scripts (chan
- the location of the python binaries and header development files,
- the location where LAL has been installed in the system.

With this information, you will have to edit the [sample script file](https://github.com/LAL-project/python-interface/blob/main/sample_script.sh). Fill in the values of the variables named in upper case. Those variables with '(?)' to their right can be left empty.
With this information, you will have to edit the [sample script file](https://github.com/LAL-project/python-interface/tree/24.10/sample_script.sh). Fill in the values of the variables named in upper case. Those variables with '(?)' to their right can be left empty.

LAL_HEADERS= # directory of the header files of LAL
LAL_LIBRARY= # directory of the binary files of LAL (.so)
Expand All @@ -63,7 +63,7 @@ With this information, you will have to edit the [sample script file](https://gi
GMP_LIBRARY= # (?) directory of the binary files of GMP (.so)
PYTHON_HEADERS= # directory of the header (development) files of python

Check the other [two](https://github.com/LAL-project/python-interface/blob/main/run_distribution_ubuntu.sh) [script](https://github.com/LAL-project/python-interface/blob/main/run_install_ubuntu.sh) files to see examples of contents.
Check the other [two](https://github.com/LAL-project/python-interface/tree/24.10/run_distribution_ubuntu.sh) [script](https://github.com/LAL-project/python-interface/tree/24.10/run_install_ubuntu.sh) files to see examples of contents.

## Compiling and installing the interface

Expand Down
10 changes: 5 additions & 5 deletions instructions/installation-python-interface-windows-sources.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ We first describe the basic setup of the system for the compilation of the pytho

## Necessary tools and basic setup of the system

We recommend installing the [`MSYS2`](https://www.msys2.org/) subsystem for simplicity. This can be done following the 7 steps in their webpage. These consist of downloading and executing the installer and executing some very well-explained commands. With a fast internet connection it should take no more than 15 minutes. If you already did it when install [LAL from sources](https://github.com/LAL-project/linear-arrangement-library/blob/master/instructions/installation-library-sources-windows.md), you may skip this step.
We recommend installing the [`MSYS2`](https://www.msys2.org/) subsystem for simplicity. This can be done following the 7 steps in their webpage. These consist of downloading and executing the installer and executing some very well-explained commands. With a fast internet connection it should take no more than 15 minutes. If you already did it when install [LAL from sources](https://github.com/LAL-project/linear-arrangement-library/tree/24.10/instructions/installation-library-sources-windows.md), you may skip this step.

## Installing the dependencies

Expand Down Expand Up @@ -36,7 +36,7 @@ The following command will install `epstopdf` and `ghostscript` and other softwa

### LAL

Install LAL either from binaries or sources (see the [main README file](https://github.com/LAL-project/linear-arrangement-library/blob/master/README.md)) of that project.
Install LAL either from binaries or sources (see the [main README file](https://github.com/LAL-project/linear-arrangement-library/tree/24.10/README.md)) of that project.

## Download the source code of the python interface

Expand All @@ -51,7 +51,7 @@ In order to compile the interface, you have to configure two build scripts (chan
- the location of the python binaries and header development files,
- the location where LAL has been installed in the system.

With this information, you will have to edit the [sample script file](https://github.com/LAL-project/python-interface/blob/main/sample_script.sh). Fill in the values of the variables named in upper case. Those variables with '(?)' to their right can be left empty.
With this information, you will have to edit the [sample script file](https://github.com/LAL-project/python-interface/tree/24.10/sample_script.sh). Fill in the values of the variables named in upper case. Those variables with '(?)' to their right can be left empty.

LAL_HEADERS= # directory of the header files of LAL
LAL_LIBRARY= # directory of the binary files of LAL (.so)
Expand All @@ -61,7 +61,7 @@ With this information, you will have to edit the [sample script file](https://gi
PYTHON_HEADERS= # directory of the header (development) files of python
PYTHON_LIBRARY= # directory of the shared object (development) files of python

Check the other [two](https://github.com/LAL-project/python-interface/blob/main/windows_compile_distribution.sh) [script](https://github.com/LAL-project/python-interface/blob/main/windows_install.sh) files to see examples of contents.
Check the other [two](https://github.com/LAL-project/python-interface/tree/24.10/windows_compile_distribution.sh) [script](https://github.com/LAL-project/python-interface/tree/24.10/windows_install.sh) files to see examples of contents.

## Compiling and installing the interface

Expand Down Expand Up @@ -104,7 +104,7 @@ In our most recent build, these were:
C:/msys64/mingw64/bin/libstdc++-6.dll
C:/msys64/mingw64/bin/libwinpthread-1.dll

Copy the dll files to both directories `lal` and `laloptimized` within conda installation. Also, if the files generated during the [debug and release compilation of LAL's sources](https://github.com/LAL-project/linear-arrangement-library/blob/master/instructions/installation-library-sources-windows.md) are not accessible in the path, then move the files
Copy the dll files to both directories `lal` and `laloptimized` within conda installation. Also, if the files generated during the [debug and release compilation of LAL's sources](https://github.com/LAL-project/linear-arrangement-library/tree/24.10/instructions/installation-library-sources-windows.md) are not accessible in the path, then move the files

- `liblal.dll` into `lal` (within conda), and
- `liblaloptimized.dll` into `laloptimized` (within conda).
2 changes: 1 addition & 1 deletion make_docs.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
###########################################################################
#
# SWIG-generated python wrapper for the Linear Arrangement Library
# Copyright (C) 2021-2023 LAL-project developers
# Copyright (C) 2021 - 2024 LAL-project developers
# Lluís Alemany Puig
#
# This program is free software: you can redistribute it and/or modify
Expand Down
4 changes: 2 additions & 2 deletions ubuntu_compile_distribution.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

LAL_HEADERS="$HOME/Documents/projects/LAL-dev/latest/c++-libs/include"
LAL_LIBRARY="$HOME/Documents/projects/LAL-dev/latest/c++-libs/lib"
LAL_HEADERS="$HOME/Documents/projects/LAL-dev/24.10/c++-libs/include"
LAL_LIBRARY="$HOME/Documents/projects/LAL-dev/24.10/c++-libs/lib"

if [ -z $1 ]; then

Expand Down
4 changes: 2 additions & 2 deletions ubuntu_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

if [ -z $1 ]; then

lal_dist_dir="$HOME/Documents/projects/LAL-dev/latest/python-libs"
lal_dist_dir="$HOME/Documents/projects/LAL-dev/24.10/python-libs"

./compile.sh \
--destination-directory="$lal_dist_dir" \
Expand All @@ -14,7 +14,7 @@ lal_dist_dir="$HOME/Documents/projects/LAL-dev/latest/python-libs"
--build=debug \
--install

lal_lib_dir="$HOME/Documents/projects/LAL-dev/latest/c++-libs/lib"
lal_lib_dir="$HOME/Documents/projects/LAL-dev/24.10/c++-libs/lib"

cp -P $lal_lib_dir/liblal*.so* $lal_dist_dir/

Expand Down
4 changes: 2 additions & 2 deletions windows_compile_distribution.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

LAL_HEADERS="C:/Users/$USER/Desktop/LAL-DISTRIBUTION/latest/windows10-c++-libs-msys64/include"
LAL_LIBRARY="C:/Users/$USER/Desktop/LAL-DISTRIBUTION/latest/windows10-c++-libs-msys64/bin"
LAL_HEADERS="C:/Users/$USER/Desktop/LAL-DISTRIBUTION/24.10/windows10-c++-libs-msys64/include"
LAL_LIBRARY="C:/Users/$USER/Desktop/LAL-DISTRIBUTION/24.10/windows10-c++-libs-msys64/bin"

if [ -z $1 ]; then

Expand Down
6 changes: 3 additions & 3 deletions windows_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ anaconda_package_dir="$anaconda_dir/Lib/site-packages"
--install

lal_dist_dir="C:/Users/$USER/Desktop/LAL-DISTRIBUTION"
lal_cpp_dir="$lal_dist_dir/latest/windows10-c++-libs-msys64"
lal_cpp_dir="$lal_dist_dir/24.10/windows10-c++-libs-msys64"

# lal dlls
cp $lal_cpp_dir/bin/liblal*.dll $dest_dir/lal
Expand All @@ -44,7 +44,7 @@ cp $lal_dist_dir/libwinpthread-1.dll $anaconda_dir
# for developers only
elif [ "$1" == "package" ]; then

dest_dir="C:/Users/$USER/Desktop/LAL-DISTRIBUTION/latest/windows10-python3-libs-anaconda"
dest_dir="C:/Users/$USER/Desktop/LAL-DISTRIBUTION/24.10/windows10-python3-libs-anaconda"

./compile.sh \
--destination-directory="$dest_dir" \
Expand All @@ -57,7 +57,7 @@ dest_dir="C:/Users/$USER/Desktop/LAL-DISTRIBUTION/latest/windows10-python3-libs-
--install

lal_dist_dir="C:/Users/$USER/Desktop/LAL-DISTRIBUTION"
lal_cpp_dir="$lal_dist_dir/latest/windows10-c++-libs-msys64"
lal_cpp_dir="$lal_dist_dir/24.10/windows10-c++-libs-msys64"

# lal dlls
cp $lal_cpp_dir/bin/liblal.dll $dest_dir/lal
Expand Down

0 comments on commit c1972c0

Please sign in to comment.