From ce4c2225f55ae19e4f815ccd7cea8b8629c57dbf Mon Sep 17 00:00:00 2001 From: "Patrou, Maria" Date: Thu, 17 Jul 2025 14:04:12 -0400 Subject: [PATCH 1/9] python package configurations for python version resolution --- drspine.spec | 9 ++++----- python/Makefile | 9 +++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/drspine.spec b/drspine.spec index e09656c..fe9f381 100644 --- a/drspine.spec +++ b/drspine.spec @@ -2,7 +2,7 @@ %global summary Data reduction software for the Neutron Spin Echo method. %global _libdir %{_prefix}/lib %define release 1 -%define python3_pkgversion 3 +%define python3_pkgversion 3.9 %define __unzip /usr/bin/unzip %define __copydir cp -a @@ -70,7 +70,7 @@ popd #copy the latex in the build directory %{__install} -d -m 0755 %{buildroot}%{_datadir}/texmf/tex/latex/contrib %{__copydir} %{_builddir}%{_datadir}/texmf/tex/latex/contrib/* %{buildroot}%{_datadir}/texmf/tex/latex/contrib/ -%make_install DESTDIR=%{buildroot}%{_prefix} +%make_install DESTDIR=%{buildroot}%{_prefix} PYTHONDESTDIR=%{buildroot} # put icons in the right place %{__mkdir} -p %{buildroot}/%{_datadir}/pixmaps/ %{__install} -m 644 desktop/drspine.png %{buildroot}/%{_datadir}/pixmaps/ @@ -89,15 +89,14 @@ mktexlsr %{_datadir}/texmf > /dev/null || : %doc README.md %license LICENSE.drspine LICENSE.linenoise # the files are in /bin, /lib, /share -# the default macros point to /usr/bin, /usr/lib, etc and cannot be used %{_bindir}/drspine %{_bindir}/drspine_activate.sh %{_bindir}/drspine_create_env.sh %{_bindir}/extract_figures %{_bindir}/mxx %{_bindir}/plain_figures -%{_libdir}/python/drspine/* -%{_libdir}/python/drspine-*.egg-info +%{python3_sitelib}/drspine/* +%{python3_sitelib}/drspine-*.egg-info %{_libdir}/libdrspine.a %{_datadir}/applications/drspine.desktop %{_datadir}/drspine/* diff --git a/python/Makefile b/python/Makefile index 98a0895..4c161fa 100644 --- a/python/Makefile +++ b/python/Makefile @@ -25,6 +25,11 @@ ifeq "$(findstring s, $(MAKEFLAGS))" "s" SETUP_FLAG=-q endif +#installation process +INSTALLATION_PARAMS=--home $(DESTDIR) +ifneq "$(PYTHONDESTDIR)" "" +INSTALLATION_PARAMS=--root "${PYTHONDESTDIR}" +endif all: build @@ -35,8 +40,8 @@ build: @$(PYTHON) setup.py $(SETUP_FLAG) build install: - @$(PYTHON) setup.py install --home $(DESTDIR) - + @$(PYTHON) setup.py install $(INSTALLATION_PARAMS) + echo "---------------- ------------------- INSTALLATION_PARAMS $(INSTALLATION_PARAMS) ---------------------" clean: @-$(PYTHON) setup.py -q clean @find . -name '*~' | xargs rm -f -- GitLab From 9654ccff13d131f2dceff0167d3f23b2ab15f8be Mon Sep 17 00:00:00 2001 From: "Patrou, Maria" Date: Tue, 22 Jul 2025 13:19:57 -0400 Subject: [PATCH 2/9] drspine exec wrapper starts to check profile and then call drspine_launch, renamed everywhere --- drspine.spec | 4 ++++ drspine_exec_wrapper | 8 ++++++++ sources/Makefile | 2 +- sources/Makefile.depend | 2 +- sources/complink_gf | 4 ++-- sources/complink_if | 4 ++-- sources/complink_ifort | 6 +++--- sources/{drspine.f90 => drspine_launch.f90} | 4 ++-- sources/linkit_ifort | 2 +- 9 files changed, 24 insertions(+), 12 deletions(-) create mode 100755 drspine_exec_wrapper rename sources/{drspine.f90 => drspine_launch.f90} (99%) diff --git a/drspine.spec b/drspine.spec index fe9f381..6dbf0dd 100644 --- a/drspine.spec +++ b/drspine.spec @@ -77,6 +77,9 @@ popd # put desktop files in the right place %{__mkdir} -p %{buildroot}%{_datadir}/applications/ %{__install} -m 644 desktop/drspine.desktop %{buildroot}%{_datadir}/applications/ +# rename and put drspine_exec_wrapper files in the right place +mv drspine_exec_wrapper %{buildroot}%{_bindir}/drspine + %check #test after install step @@ -90,6 +93,7 @@ mktexlsr %{_datadir}/texmf > /dev/null || : %license LICENSE.drspine LICENSE.linenoise # the files are in /bin, /lib, /share %{_bindir}/drspine +%{_bindir}/drspine_launch %{_bindir}/drspine_activate.sh %{_bindir}/drspine_create_env.sh %{_bindir}/extract_figures diff --git a/drspine_exec_wrapper b/drspine_exec_wrapper new file mode 100755 index 0000000..35312af --- /dev/null +++ b/drspine_exec_wrapper @@ -0,0 +1,8 @@ +#!/bin/bash +profile_home=`ipython profile locate drspine 2> /dev/null` +profile_exists=$? +if [ $profile_exists -eq 1 ]; then + echo "drspine ipython profile not found: ${profile_home} ${profile_exists}" + drspine_create_env.sh -rv +fi +drspine_launch \ No newline at end of file diff --git a/sources/Makefile b/sources/Makefile index acf3693..de27832 100644 --- a/sources/Makefile +++ b/sources/Makefile @@ -32,7 +32,7 @@ LDLIBS:=$(PROJLIB) $(LDLIBS) HASMAKEDEP := $(and $(MAKEDEPEND),$(MAKEDEPF90)) PROGSRC=\ - drspine.f90 \ + drspine_launch.f90 \ extract_figures.f90 \ plain_figures.f90 \ mxx.f90 diff --git a/sources/Makefile.depend b/sources/Makefile.depend index e956e61..f95a545 100644 --- a/sources/Makefile.depend +++ b/sources/Makefile.depend @@ -35,7 +35,7 @@ instrument_config.o : instrument_config.f90 echo_shapes.o binning.o geometry_typ module_gen_makro.o : module_gen_makro.f90 strings_module.o gr_interface.o : gr_interface.f90 drspine_parameters.o plot_utils.o : plot_utils.f90 texology.o dump_data.o data_types.o gr_interface.o -drspine.o : drspine.f90 plot_utils.o module_gen_makro.o getopt_m.o texology.o file_utils.o write_utils.o reduce_data.o dump_data.o fit_data.o read_data.o instrument_config.o data_manager.o data_types.o minimization.o matching.o constants_module.o drspine_version.o drspine_parameters.o new_com.o +drspine_launch.o : drspine_launch.f90 plot_utils.o module_gen_makro.o getopt_m.o texology.o file_utils.o write_utils.o reduce_data.o dump_data.o fit_data.o read_data.o instrument_config.o data_manager.o data_types.o minimization.o matching.o constants_module.o drspine_version.o drspine_parameters.o new_com.o extract_figures.o : extract_figures.f90 plain_figures.o : plain_figures.f90 mxx.o : mxx.f90 diff --git a/sources/complink_gf b/sources/complink_gf index 4a359a7..b6ecc4b 100755 --- a/sources/complink_gf +++ b/sources/complink_gf @@ -23,8 +23,8 @@ gfortran -g -c \ read_data.f90 \ fit_data.f90 \ dump_data.f90 -gfortran -g -fbounds-check -o drspine \ - drspine.o \ +gfortran -g -fbounds-check -o drspine_launch \ + drspine_launch.o \ module_const.o \ module_params.o \ module_basetypes.o \ diff --git a/sources/complink_if b/sources/complink_if index c19d45e..f00d5dc 100755 --- a/sources/complink_if +++ b/sources/complink_if @@ -1,4 +1,4 @@ -ifort -g -c drspine.f90 \ +ifort -g -c drspine_launch.f90 \ module_const.f90 \ module_params.f90 \ module_basetypes.f90\ @@ -15,7 +15,7 @@ ifort -g -c drspine.f90 \ read_data.f90 \ fit_data.f90 \ dump_data.f90 -ifort -g -o drspine drspine.o \ +ifort -g -o drspine_launch drspine_launch.o \ module_const.o \ module_params.o \ module_basetypes.o\ diff --git a/sources/complink_ifort b/sources/complink_ifort index b27c5d5..571ca7a 100755 --- a/sources/complink_ifort +++ b/sources/complink_ifort @@ -1,5 +1,5 @@ ifort -g -C -c \ - drspine.f90 \ + drspine_launch.f90 \ module_const.f90 \ module_params.f90 \ module_basetypes.f90\ @@ -16,8 +16,8 @@ ifort -g -C -c \ read_data.f90 \ fit_data.f90 \ dump_data.f90 -ifort -g -C -o drspine \ - drspine.o \ +ifort -g -C -o drspine_launch \ + drspine_launch.o \ module_const.o \ module_params.o \ module_basetypes.o \ diff --git a/sources/drspine.f90 b/sources/drspine_launch.f90 similarity index 99% rename from sources/drspine.f90 rename to sources/drspine_launch.f90 index 5b69cb2..864d7f0 100644 --- a/sources/drspine.f90 +++ b/sources/drspine_launch.f90 @@ -1,7 +1,7 @@ !! DrSPINE MAIN PROGRAM !! --> gitLab !! =========================================================== -program drspine +program drspine_launch use, intrinsic :: iso_fortran_env, only : output_unit, error_unit use new_com @@ -5200,7 +5200,7 @@ ntl2: do i=0, nt end subroutine myusrfun -end program drspine +end program drspine_launch diff --git a/sources/linkit_ifort b/sources/linkit_ifort index cf45242..9bb291b 100755 --- a/sources/linkit_ifort +++ b/sources/linkit_ifort @@ -1,4 +1,4 @@ -gfortran -o drspine drspine.o \ +gfortran -o drspine_launch drspine_launch.o \ module_const.o \ module_params.o \ module_basetypes.o \ -- GitLab From 8d1d70df22e41a20bfe412b4ecc2bf3c310bea76 Mon Sep 17 00:00:00 2001 From: "Patrou, Maria" Date: Tue, 22 Jul 2025 15:10:42 -0400 Subject: [PATCH 3/9] drspine wrapper renamed, python version added on package --- drspine.spec | 4 ++-- drspine_exec_wrapper => drspine_wrapper | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename drspine_exec_wrapper => drspine_wrapper (100%) diff --git a/drspine.spec b/drspine.spec index 6dbf0dd..07ddb85 100644 --- a/drspine.spec +++ b/drspine.spec @@ -6,7 +6,7 @@ %define __unzip /usr/bin/unzip %define __copydir cp -a -Name: %{srcname} +Name: python%{python3_pkgversion}-%{srcname} Version: 1.4.3 Release: %{release}%{?dist} @@ -78,7 +78,7 @@ popd %{__mkdir} -p %{buildroot}%{_datadir}/applications/ %{__install} -m 644 desktop/drspine.desktop %{buildroot}%{_datadir}/applications/ # rename and put drspine_exec_wrapper files in the right place -mv drspine_exec_wrapper %{buildroot}%{_bindir}/drspine +mv drspine_wrapper %{buildroot}%{_bindir}/drspine %check diff --git a/drspine_exec_wrapper b/drspine_wrapper similarity index 100% rename from drspine_exec_wrapper rename to drspine_wrapper -- GitLab From 6cf0d8b9a4fa1cadce10ed51951710193170be72 Mon Sep 17 00:00:00 2001 From: Pete Peterson Date: Wed, 23 Jul 2025 15:14:20 -0400 Subject: [PATCH 4/9] Change the name of the source tarball --- drspine.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drspine.spec b/drspine.spec index 07ddb85..f49596c 100644 --- a/drspine.spec +++ b/drspine.spec @@ -15,7 +15,7 @@ Group: Development/Libraries License: MIT URL: https://code.ornl.gov/zp1/drspine/ -Source0: %{name}-%{version}.tar.gz +Source0: %{srcname}-%{version}.tar.gz Source1: appendix.zip Source2: cprotect.zip Source3: draftwatermark.zip @@ -29,7 +29,7 @@ Requires: libgfortran%{?_isa}, compat-libgfortran-48%{?_isa}, python%{pyth %{summary} %prep -%setup -q +%setup -q -n %{srcname}-%{version} -n %{srcname}-%{version} %{__unzip} -q %{SOURCE1} %{__unzip} -q %{SOURCE2} %{__unzip} -q %{SOURCE3} @@ -44,24 +44,24 @@ Requires: libgfortran%{?_isa}, compat-libgfortran-48%{?_isa}, python%{pyth pushd ./appendix latex ./appendix.ins %{__install} -m 644 appendix.sty %{_builddir}%{_datadir}/texmf/tex/latex/contrib - %{__install} -m 644 appendix.sty %{_builddir}/%{name}-%{version}/doc + %{__install} -m 644 appendix.sty %{_builddir}/%{srcname}-%{version}/doc popd pushd ./draftwatermark latex ./draftwatermark.ins %{__install} -m 644 draftwatermark.sty %{_builddir}%{_datadir}/texmf/tex/latex/contrib - %{__install} -m 644 draftwatermark.sty %{_builddir}/%{name}-%{version}/doc + %{__install} -m 644 draftwatermark.sty %{_builddir}/%{srcname}-%{version}/doc popd pushd ./relsize %{__install} -m 644 relsize.sty %{_builddir}%{_datadir}/texmf/tex/latex/contrib - %{__install} -m 644 relsize.sty %{_builddir}/%{name}-%{version}/doc + %{__install} -m 644 relsize.sty %{_builddir}/%{srcname}-%{version}/doc popd pushd ./cprotect latex ./cprotect.dtx %{__install} -m 644 cprotect.sty %{_builddir}%{_datadir}/texmf/tex/latex/contrib - %{__install} -m 644 cprotect.sty %{_builddir}/%{name}-%{version}/doc + %{__install} -m 644 cprotect.sty %{_builddir}/%{srcname}-%{version}/doc popd %{__make} INSTRUMENT=1 GRDIR=%{_usr}/gr all -- GitLab From c79b82bbcd9eee013c9051895850e82d5e70a21a Mon Sep 17 00:00:00 2001 From: Pete Peterson Date: Wed, 23 Jul 2025 15:20:17 -0400 Subject: [PATCH 5/9] Bump version number to 1.4.4 so it overwrites previous ones --- drspine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drspine.spec b/drspine.spec index f49596c..39706af 100644 --- a/drspine.spec +++ b/drspine.spec @@ -7,7 +7,7 @@ %define __copydir cp -a Name: python%{python3_pkgversion}-%{srcname} -Version: 1.4.3 +Version: 1.4.4 Release: %{release}%{?dist} Summary: %{summary} -- GitLab From 70bab997544998f56516e066de7cb8650f61018d Mon Sep 17 00:00:00 2001 From: Pete Peterson Date: Wed, 23 Jul 2025 15:39:05 -0400 Subject: [PATCH 6/9] Obsolete the previous package name --- drspine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/drspine.spec b/drspine.spec index 39706af..2aeb0ba 100644 --- a/drspine.spec +++ b/drspine.spec @@ -11,6 +11,7 @@ Version: 1.4.4 Release: %{release}%{?dist} Summary: %{summary} +Obsoletes: drspine <= 1.4.3 Group: Development/Libraries License: MIT -- GitLab From 9fb1ab87ac0cf3e24cdad3d3a1994b2b5229b434 Mon Sep 17 00:00:00 2001 From: "Patrou, Maria" Date: Wed, 23 Jul 2025 20:09:33 -0400 Subject: [PATCH 7/9] renamed drspine back, only rename in rpm, drspine.bin, version update, pass parameters in script --- Makefile.version | 2 +- drspine.spec | 3 ++- drspine_wrapper | 2 +- sources/Makefile | 2 +- sources/Makefile.depend | 2 +- sources/complink_gf | 4 ++-- sources/complink_if | 4 ++-- sources/complink_ifort | 6 +++--- sources/{drspine_launch.f90 => drspine.f90} | 0 sources/linkit_ifort | 2 +- 10 files changed, 14 insertions(+), 13 deletions(-) rename sources/{drspine_launch.f90 => drspine.f90} (100%) diff --git a/Makefile.version b/Makefile.version index 46c7488..00a57c8 100644 --- a/Makefile.version +++ b/Makefile.version @@ -3,7 +3,7 @@ export PROJECT=drspine export VERSION_MAJOR=1 export VERSION_MINOR=4 -export VERSION_RELEASE=3 +export VERSION_RELEASE=4 export PROJLIB=lib$(PROJECT).a export PROJARCH=$(PROJECT)-$(VERSION_MAJOR).$(VERSION_MINOR) diff --git a/drspine.spec b/drspine.spec index 2aeb0ba..5fdee4b 100644 --- a/drspine.spec +++ b/drspine.spec @@ -79,6 +79,7 @@ popd %{__mkdir} -p %{buildroot}%{_datadir}/applications/ %{__install} -m 644 desktop/drspine.desktop %{buildroot}%{_datadir}/applications/ # rename and put drspine_exec_wrapper files in the right place +mv sources/drspine %{buildroot}%{_bindir}/drspine.bin mv drspine_wrapper %{buildroot}%{_bindir}/drspine @@ -94,7 +95,7 @@ mktexlsr %{_datadir}/texmf > /dev/null || : %license LICENSE.drspine LICENSE.linenoise # the files are in /bin, /lib, /share %{_bindir}/drspine -%{_bindir}/drspine_launch +%{_bindir}/drspine.bin %{_bindir}/drspine_activate.sh %{_bindir}/drspine_create_env.sh %{_bindir}/extract_figures diff --git a/drspine_wrapper b/drspine_wrapper index 35312af..251de47 100755 --- a/drspine_wrapper +++ b/drspine_wrapper @@ -5,4 +5,4 @@ if [ $profile_exists -eq 1 ]; then echo "drspine ipython profile not found: ${profile_home} ${profile_exists}" drspine_create_env.sh -rv fi -drspine_launch \ No newline at end of file +drspine.bin $* \ No newline at end of file diff --git a/sources/Makefile b/sources/Makefile index de27832..acf3693 100644 --- a/sources/Makefile +++ b/sources/Makefile @@ -32,7 +32,7 @@ LDLIBS:=$(PROJLIB) $(LDLIBS) HASMAKEDEP := $(and $(MAKEDEPEND),$(MAKEDEPF90)) PROGSRC=\ - drspine_launch.f90 \ + drspine.f90 \ extract_figures.f90 \ plain_figures.f90 \ mxx.f90 diff --git a/sources/Makefile.depend b/sources/Makefile.depend index f95a545..e956e61 100644 --- a/sources/Makefile.depend +++ b/sources/Makefile.depend @@ -35,7 +35,7 @@ instrument_config.o : instrument_config.f90 echo_shapes.o binning.o geometry_typ module_gen_makro.o : module_gen_makro.f90 strings_module.o gr_interface.o : gr_interface.f90 drspine_parameters.o plot_utils.o : plot_utils.f90 texology.o dump_data.o data_types.o gr_interface.o -drspine_launch.o : drspine_launch.f90 plot_utils.o module_gen_makro.o getopt_m.o texology.o file_utils.o write_utils.o reduce_data.o dump_data.o fit_data.o read_data.o instrument_config.o data_manager.o data_types.o minimization.o matching.o constants_module.o drspine_version.o drspine_parameters.o new_com.o +drspine.o : drspine.f90 plot_utils.o module_gen_makro.o getopt_m.o texology.o file_utils.o write_utils.o reduce_data.o dump_data.o fit_data.o read_data.o instrument_config.o data_manager.o data_types.o minimization.o matching.o constants_module.o drspine_version.o drspine_parameters.o new_com.o extract_figures.o : extract_figures.f90 plain_figures.o : plain_figures.f90 mxx.o : mxx.f90 diff --git a/sources/complink_gf b/sources/complink_gf index b6ecc4b..4a359a7 100755 --- a/sources/complink_gf +++ b/sources/complink_gf @@ -23,8 +23,8 @@ gfortran -g -c \ read_data.f90 \ fit_data.f90 \ dump_data.f90 -gfortran -g -fbounds-check -o drspine_launch \ - drspine_launch.o \ +gfortran -g -fbounds-check -o drspine \ + drspine.o \ module_const.o \ module_params.o \ module_basetypes.o \ diff --git a/sources/complink_if b/sources/complink_if index f00d5dc..c19d45e 100755 --- a/sources/complink_if +++ b/sources/complink_if @@ -1,4 +1,4 @@ -ifort -g -c drspine_launch.f90 \ +ifort -g -c drspine.f90 \ module_const.f90 \ module_params.f90 \ module_basetypes.f90\ @@ -15,7 +15,7 @@ ifort -g -c drspine_launch.f90 \ read_data.f90 \ fit_data.f90 \ dump_data.f90 -ifort -g -o drspine_launch drspine_launch.o \ +ifort -g -o drspine drspine.o \ module_const.o \ module_params.o \ module_basetypes.o\ diff --git a/sources/complink_ifort b/sources/complink_ifort index 571ca7a..b27c5d5 100755 --- a/sources/complink_ifort +++ b/sources/complink_ifort @@ -1,5 +1,5 @@ ifort -g -C -c \ - drspine_launch.f90 \ + drspine.f90 \ module_const.f90 \ module_params.f90 \ module_basetypes.f90\ @@ -16,8 +16,8 @@ ifort -g -C -c \ read_data.f90 \ fit_data.f90 \ dump_data.f90 -ifort -g -C -o drspine_launch \ - drspine_launch.o \ +ifort -g -C -o drspine \ + drspine.o \ module_const.o \ module_params.o \ module_basetypes.o \ diff --git a/sources/drspine_launch.f90 b/sources/drspine.f90 similarity index 100% rename from sources/drspine_launch.f90 rename to sources/drspine.f90 diff --git a/sources/linkit_ifort b/sources/linkit_ifort index 9bb291b..cf45242 100755 --- a/sources/linkit_ifort +++ b/sources/linkit_ifort @@ -1,4 +1,4 @@ -gfortran -o drspine_launch drspine_launch.o \ +gfortran -o drspine drspine.o \ module_const.o \ module_params.o \ module_basetypes.o \ -- GitLab From c6797340a05c3e2cd6c17eac5a3f2a6f93d22331 Mon Sep 17 00:00:00 2001 From: "Patrou, Maria" Date: Wed, 23 Jul 2025 20:19:16 -0400 Subject: [PATCH 8/9] restore program name --- sources/drspine.f90 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sources/drspine.f90 b/sources/drspine.f90 index 864d7f0..d92c5b9 100644 --- a/sources/drspine.f90 +++ b/sources/drspine.f90 @@ -1,7 +1,7 @@ !! DrSPINE MAIN PROGRAM !! --> gitLab !! =========================================================== -program drspine_launch +program drspine use, intrinsic :: iso_fortran_env, only : output_unit, error_unit use new_com @@ -5200,7 +5200,6 @@ ntl2: do i=0, nt end subroutine myusrfun -end program drspine_launch - +end program drspine -- GitLab From e1556e06a1b54b6fc6322463fd9a422c26d6ae00 Mon Sep 17 00:00:00 2001 From: "Patrou, Maria" Date: Wed, 23 Jul 2025 20:20:01 -0400 Subject: [PATCH 9/9] restore space --- sources/drspine.f90 | 1 + 1 file changed, 1 insertion(+) diff --git a/sources/drspine.f90 b/sources/drspine.f90 index d92c5b9..5b69cb2 100644 --- a/sources/drspine.f90 +++ b/sources/drspine.f90 @@ -5203,3 +5203,4 @@ ntl2: do i=0, nt end program drspine + -- GitLab