Commit Graph

199 Commits

Author SHA1 Message Date
Sylvain Tricot 25fd8114a5 Merge branch 'feature/correlation_expansion' into devel
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2022-02-15 11:01:22 +01:00
Sylvain Tricot 39074f75b6 Fixed some minor bugs.
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
Fixed some bugs. The correlation expansion version now compiles!
The shared object is imported in the calculator.py module.
2022-02-09 19:08:22 +01:00
Sylvain Tricot 6986dde636 Added main anf Makefile rules for CE. 2022-02-09 19:07:03 +01:00
Sylvain Tricot d09ba1b590 Added main_phd_ns_ce.f
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
This file was updated to be compatible with Python bindings.
The begining of the file is identical to the series expansion
version, so it was copied from there.
2022-02-09 14:35:26 +01:00
Sylvain Tricot f4f204305e Added lapack_axb.f
This file is the same as for the matrix inversion.
2022-02-09 14:34:52 +01:00
Sylvain Tricot 2b6a8b6e05 Added phddif_ce.f file.
The file was updated to be compatible with Python bindings.
2022-02-09 14:19:30 +01:00
Sylvain Tricot 9ebf6c6bc3 Added coumat.f and treat_phd.f
Those 2 files were copied from the phd_se version since
they are identical.
2022-02-09 14:18:22 +01:00
Sylvain Tricot 998fdbee88 Added ms_cor.f file.
The file ms_cor.f was updated to be compatible with Python
bindings.
2022-02-09 13:46:03 +01:00
Sylvain Tricot b1f34aef6a Added mpis.f file.
The file mpis.f was updated to be compatible with Python
bindings. The module CORREXP_MOD was created and is now
allocated in memalloc/allocation.f. The parameter NLMM was
added to dim_mod.f.
2022-02-09 13:39:28 +01:00
Sylvain Tricot 58e9731ffd Added gaunt_st.f file.
The file gaunt_st.f was updated to be compatible with Python
bindings. The module GAUNT_C was created.
2022-02-09 13:24:07 +01:00
Sylvain Tricot 0b889681d1 Added corexp1.f file
The file corexp1.f was updated to be compatible with Python
bindings.
2022-02-09 13:11:17 +01:00
Sylvain Tricot f262f96004 Added and updated corexp.f
The file corexp.f was updated to be compatible with Python
bindings.
2022-02-09 13:08:06 +01:00
Sylvain Tricot e3c0accbcb Added and updated coefpq.f
The file coefpq.f was updated to be compatible with Python
bindings. The common /Q_ARRAY/ was refactored as a module in
memalloc/modules.f and allocated in memalloc/allocation.f.
2022-02-09 12:22:05 +01:00
Sylvain Tricot 39eb3dc9d8 Added and updated cmngr.f
The file cmngr.f was updated to be compatible with Python bindings.
2022-02-09 12:02:24 +01:00
Sylvain Tricot 1dba5cbe47 Added files common to SE and CE.
5 files are common to Series Expansion and Correlation Expansion
algortithms. They are now in the dedicated phd_ce_noso_nosp_nosym
folder.
2022-02-09 11:43:35 +01:00
Sylvain Tricot ca1fd04163 Modified cut_cylinder and cut_plane functions.
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
cut_cylinder and cut_plane functions were too slow due to
lists modifications in for loops. Implementation was modified
a bit while keeping the same API.
For now, cutting a cylinder for an axis 'x' or 'y' is not supported
anymore.
2022-02-08 15:20:32 +01:00
Sylvain Tricot a657b1874e Changed memory requirements. 2022-02-08 15:19:26 +01:00
Sylvain Tricot 1fd9509608 Added the malloc keyword.
In the stereo scan, the malloc keyword is now specified.
2022-02-08 14:39:03 +01:00
Sylvain Tricot 925d694099 Added 'other_parameters' keyword to any scan.
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
This keyword is a dictionary allowing any option
to be passed to Phagen or Spec just before runing
the calculation. It is usefull to pass special options
that are for example set automatically otherwise.
2021-11-30 16:26:10 +01:00
Sylvain Tricot 7567b920a1 Add Lapack/Blas compilation flag. 2021-11-30 16:21:05 +01:00
Sylvain Tricot 369e743197 Removed all f-strings.
By replacing f-strings by the standard ".format" call,
the package can be now compatible with python3.5
2021-09-27 17:49:48 +02:00
Sylvain Tricot ec0fc248ce Merge branch 'master' into devel
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
2021-09-27 16:19:24 +02:00
Sylvain Tricot 8269d35420 Updated venv target in Makefile.
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
The 'venv' target has been modified to ensure that
setuptools is at the latest version, otherwise the
docker image could not be created.

Dockerfile was modified to pull the master branch
instead of the devel one.
2021-09-27 15:50:52 +02:00
Sylvain Tricot 0d6db43597 Removed 'syncing website' stage
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
In the CI, the website is not uploaded at the
end of the process for the 'devel' branch.
2021-09-27 14:33:17 +02:00
Sylvain Tricot d6882b57b9 Tried to fix the broken 'syncing website' stage.
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
This last stage is not working due to permission
issues on the server side. I tried to just update
existing files instead of removing everything and
copying new files. Let's see...
2021-09-27 14:17:25 +02:00
Sylvain Tricot e1659db33b Updated the git repo link in 'install section'
The previous link pointed to the devel branch of the repo.
Replaced by the master branch
2021-09-27 14:16:07 +02:00
Sylvain Tricot 89b2a378a5 Fixed bug in copper tutorial.
In the first example lines of the copper tutorial, the line
'view(cluster)' raised an error since the 'cluster' variable
was not yet declared. Replaced by 'view(copper)'.
2021-09-27 14:14:27 +02:00
Sylvain Tricot 4d3ac28343 Added the syncing website section in CI
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
A stage to update the website was added to the
Jenkinsfile.
2021-09-24 17:02:03 +02:00
Sylvain Tricot bdbd320bf4 Modified JenkinsFile.
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
2021-09-24 16:50:08 +02:00
Sylvain Tricot 75784d4c01 Merge branch 'devel'
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2021-09-24 16:36:53 +02:00
Sylvain Tricot 58194a38dd Updated CI Jenkinsfile.
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2021-09-24 16:34:13 +02:00
Sylvain Tricot 85d8936f8e Merge branch 'master' of https://git.ipr.univ-rennes1.fr/epsi/msspec_python3 2021-09-24 16:32:33 +02:00
Sylvain Tricot 419c55b744 Removed pdf building of the documentation.
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
For the moment, the building of the pdf from the
website is deactivated. It may be activated again
in future commits.
2021-09-24 16:14:50 +02:00
Sylvain Tricot b011e4348c Updated documentation and tutorials.
Download and install section contains now information about
how to install MsSpec using Docker.
Tutorials have been updated a bit.
2021-09-24 16:13:14 +02:00
Sylvain Tricot 08c6ea7a34 Updated installation instructions.
The README.md file contains now more information on how to
install MsSpec (compilation and Python package) either in
standard or devel mode.
2021-09-24 16:04:34 +02:00
Sylvain Tricot 8c04b700f1 Added Windows Docker frontend files.
The Powershell script (*.ps1) equivalent to the Linux Bash script is
used under Windows as a frontend to the Docker image of MsSpec.
It is converted to an *.exe file (msspec.exe) which is installed
by the setup program (msspec_setup.exe) created by Inno Setup using
the *.iss scripts. The end user will just download the msspec_setup.exe
file.
2021-09-24 15:39:05 +02:00
Sylvain Tricot 928771ac4e Changed mode of msspec docker frontend. 2021-09-23 16:55:16 +02:00
Sylvain Tricot 13f0001dde Change how pip is installed in Makefile
Previously, the ensurepip method was used
but it is not working as expected in some
Python distributions were it is not included.
Falling back to the bootstraping get-pip.py is
safer.
2021-09-23 16:53:02 +02:00
Sylvain Tricot dfa693dfb6 Change the "uninstall" option name to "-u"
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
The script for dockerized MsSpec could be uninstalled
with the "msspec uninstall" command whereas it is
"msspec -u" for the non containered version. It is
now "-u" for both scripts.
2021-09-22 14:29:59 +02:00
Sylvain Tricot 34d0e720f5 Add the frontend to the linux dockerized MsSpec.
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
This script is the frontend of the dockerized MsSpec
for Linux. The user has just to download it, make it
executable and place it in the $PATH to run MsSpec.
2021-09-21 17:52:10 +02:00
Sylvain Tricot a57b8d138b Fix bug in "msspec -p" command.
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
When using python options (like "-c" for example), all
arguments from the command line were not passed to the
launch_script function because of missing double quotes
around the $@ array.
2021-09-20 11:17:26 +02:00
Sylvain Tricot 230340b1fd Work on docker support.
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
pip was not the default script in the virtualenv in the docker image (pip3 was).
So we had to use "ensurepip" as recommended by the pip team.

The Dockerfile was a bit simplified.
2021-09-17 11:55:23 +02:00
Sylvain Tricot 4b23806482 Specify gfortran executables for f2py3
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2021-07-21 23:06:41 +02:00
Sylvain Tricot df5c0de8b7 Fix bug, the rank was not set properly 2021-07-21 23:06:12 +02:00
Sylvain Tricot 391c4629a7 Split wx target to avoid compiling two times 2021-07-21 23:05:34 +02:00
Sylvain Tricot 0e04dd4a75 Remove config of logging in looper
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
Because it overriveded the global logging level...
2021-07-21 10:45:34 +02:00
Sylvain Tricot 74f970e7dd Add pandas to the list
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2021-07-20 16:48:29 +02:00
Sylvain Tricot 3743cb8d17 Changed return values of Looper.run
Instead of returning a panda dataframe, return both a list
of [x0, y0, x1, y1,...] values for all the calculations and the
corresponding dict of parameters
2021-07-20 16:45:37 +02:00
Sylvain Tricot c2b9e9a572 Changed installation instructions. 2021-07-20 16:42:46 +02:00
Sylvain Tricot 7ebd1d25e2 Work on documentation:installation section
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2021-07-05 17:50:49 +02:00