From 2207ab7f8968eb6acb19716428d6335ac07437d7 Mon Sep 17 00:00:00 2001 From: Kazuyoshi Yoshimi Date: Sun, 20 Nov 2022 02:45:00 +0900 Subject: [PATCH 1/9] change reference version of StdFace from v0.1 to v0.3 --- src/StdFace | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/StdFace b/src/StdFace index 213c4406..92967761 160000 --- a/src/StdFace +++ b/src/StdFace @@ -1 +1 @@ -Subproject commit 213c4406cb8c59068319e02550ed9983196eacfe +Subproject commit 92967761b56e6ddf69b1039102dbf0d09256242c From 1bdf4c0abe3dd741d2a16b6d629b541a3b202c86 Mon Sep 17 00:00:00 2001 From: Yuichi Motoyama Date: Mon, 21 Nov 2022 09:45:35 +0900 Subject: [PATCH 2/9] make docs clearer --- .../source/finite_temperature/spin_chain.rst | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/doc/tutorial/en/source/finite_temperature/spin_chain.rst b/doc/tutorial/en/source/finite_temperature/spin_chain.rst index f1be96cf..f780296b 100644 --- a/doc/tutorial/en/source/finite_temperature/spin_chain.rst +++ b/doc/tutorial/en/source/finite_temperature/spin_chain.rst @@ -28,7 +28,7 @@ Full diagonalization """"""""""""""""""""""""""""""" After executing the full diagonalization, all the eigenvalues are output in **output/Eiegenvalue.dat**. -By using the python script **(``samples/tutorial_2.1/Finite.py``)**, +By using the python script **(samples/tutorial_2.1/Finite.py)**, you can obtain the temperature dependence of the energy and the specific heat. You can execute **Finite.py** as follows :: @@ -48,11 +48,11 @@ the 3rd row represents the specific heat defined by :math:`C=(\langle E^2 \rangle-\langle E \rangle^2)/T^2`. Micro-canonical TPQ (mTPQ) method (Sz=0) -""""""""""""""""""""""""""""""" +""""""""""""""""""""""""""""""""""""""""""""" By selecting method as "TPQ", you can perform the finite-temperature calculations using the mTPQ method. -The input file (``samples/tutorial_2.1/stan2.in``) for 12-site Heisenberg model is as follows:: +The input file (**samples/tutorial_2.1/stan2.in**) for 12-site Heisenberg model is as follows:: L = 12 model = "Spin" @@ -64,7 +64,7 @@ The input file (``samples/tutorial_2.1/stan2.in``) for 12-site Heisenberg model After performing the TPQ calculations, results are output in **output/SS_rand*.dat**. -By using the python script **(``samples/tutorial_2.1/AveSSrand.py``)**, +By using the python script **(samples/tutorial_2.1/AveSSrand.py)**, you can obtain the temperature dependence of physical quantities such as the energy and the specific heat. @@ -107,7 +107,7 @@ Here, note that "model = Spin" is changed to "model = SpinGC" and After performing the TPQ calculations, temperature dependence of several physical quantities such as number of particel N and total Sz are output in **output/Flct_rand*.dat**. -By using the python script **(``samples/tutorial_2.1/AveFlct.py``)**, +By using the python script **(samples/tutorial_2.1/AveFlct.py)**, you can obtain the temperature dependence of physical quantities such as the energy and the spin susceptibility :math:`\chi`. Note that :math:`\chi` is defined as @@ -141,7 +141,7 @@ You can see the following output image. :align: center Canonical TPQ (cTPQ) method (Advanced) -""""""""""""""""""""""""""""""" +""""""""""""""""""""""""""""""""""""""""""" In the cTPQ method, we generate the *k*\th TPQ state as .. math:: @@ -181,23 +181,24 @@ In this example, we choose ``10`` samples from ``10`` samples with allowing duplications for ``5`` times in the bootstrap sampling. In ``BS_MaxBS5.dat``, the following physical quantities are output:: - T E E_err C C_err S S_err Sz Sz_err chi_Sz chi_Sz_err Z Z_err k + T E E_err C C_err S S_err Sz Sz_err chi_Sz chi_Sz_err Z Z_err k where -``T`` :temperature (:math:`T=1/\beta=1/(k\Delta\tau)`), -``E`` :average value of energy, -``E_err`` :error of energy, -``C`` :average value of specific heat, -``C_err`` :error of specific heat, -``S`` :average value of entropy, -``S_err`` :error of entropy, -``Sz`` :average value of Sz, -``Sz_err`` :error of Sz, -``chi_Sz`` :average value of chi_Sz, -``chi_Sz_err`` :error of chi_Sz, -``Z`` :average value of norm the wave function, -``Z_err`` :error of norm of the wave function, and -``k`` :number of the cTPQ state. + +#. ``T`` : temperature (:math:`T=1/\beta=1/(k\Delta\tau)`), +#. ``E`` : average value of energy, +#. ``E_err`` : error of energy, +#. ``C`` : average value of specific heat, +#. ``C_err`` : error of specific heat, +#. ``S`` : average value of entropy, +#. ``S_err`` : error of entropy, +#. ``Sz`` : average value of Sz, +#. ``Sz_err`` : error of Sz, +#. ``chi_Sz`` : average value of chi_Sz, +#. ``chi_Sz_err`` : error of chi_Sz, +#. ``Z`` : average value of norm the wave function, +#. ``Z_err`` : error of norm of the wave function, and +#. ``k`` : number of the cTPQ state. For example, you can see the temperature dependence of the specific heat as:: From 420968d474ffe291765b2766db455901982579d8 Mon Sep 17 00:00:00 2001 From: Yuichi Motoyama Date: Wed, 22 Feb 2023 16:06:22 +0900 Subject: [PATCH 3/9] CI test on Ubuntu 22.04 --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 69dfe9de..b5aeb0ad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,13 +8,16 @@ jobs: strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-22.04] mpisize: [1, 4, 16] ompsize: [1, 3] include: - os: macos-10.15 mpisize: 1 ompsize: 1 + - os: ubuntu-20.04 + mpisize: 1 + ompsize: 1 fail-fast: false env: From 91cc1381c2530dff02110fd2bb3e5bad77550f31 Mon Sep 17 00:00:00 2001 From: Yuichi Motoyama Date: Wed, 22 Feb 2023 16:50:25 +0900 Subject: [PATCH 4/9] correct np.dtypes --- .../en/source/zero_temperature/vector.rst | 4 +- samples/tutorial_1.5/CalcSq.py | 4 +- samples/tutorial_1.7/read_gs.py | 4 +- samples/tutorial_2.1/Finite.py | 2 +- samples/tutorial_2.1/Norm_TPQ.py | 38 ++++++++--------- samples/tutorial_2.2/Finite.py | 2 +- test/Ave_SS.py | 42 +++++++++---------- tool/ExpertSpin/MakeDef.py | 18 ++++---- tool/FiniteT/Finite.py | 2 +- tool/ForSq/CalcSq.py | 4 +- 10 files changed, 60 insertions(+), 60 deletions(-) diff --git a/doc/tutorial/en/source/zero_temperature/vector.rst b/doc/tutorial/en/source/zero_temperature/vector.rst index f62008fd..4a763667 100644 --- a/doc/tutorial/en/source/zero_temperature/vector.rst +++ b/doc/tutorial/en/source/zero_temperature/vector.rst @@ -17,12 +17,12 @@ For example, the following python function (``samples/tutorial-1.7/read_gs.py``) with open(filename, "rb") as f: f.read(4) nelems = unpack("L", f.read(8))[0] - ret = np.zeros(nelems, dtype=np.complex) + ret = np.zeros(nelems, dtype=np.complex128) f.read(16) for i in range(nelems): re = unpack("d", f.read(8))[0] im = unpack("d", f.read(8))[0] - ret[i] = np.complex(re, im) + ret[i] = complex(re, im) return ret Exercise diff --git a/samples/tutorial_1.5/CalcSq.py b/samples/tutorial_1.5/CalcSq.py index 58a0abce..7b96c2b4 100755 --- a/samples/tutorial_1.5/CalcSq.py +++ b/samples/tutorial_1.5/CalcSq.py @@ -58,8 +58,8 @@ def func_input(list_lat): #[e] initialize #[s] allocate -Sq = np.zeros([Lx+1,Ly+1],dtype=np.float) -Sq_err = np.zeros([Lx+1,Ly+1],dtype=np.float) +Sq = np.zeros([Lx+1,Ly+1],dtype=np.float64) +Sq_err = np.zeros([Lx+1,Ly+1],dtype=np.float64) #[e] allocate max_num = 1 for num_cg in range(0,max_num): diff --git a/samples/tutorial_1.7/read_gs.py b/samples/tutorial_1.7/read_gs.py index 77dee82e..e178c94e 100644 --- a/samples/tutorial_1.7/read_gs.py +++ b/samples/tutorial_1.7/read_gs.py @@ -8,10 +8,10 @@ def read_gs(*, index=0, rank=0): with open(filename, "rb") as f: f.read(4) nelems = unpack("L", f.read(8))[0] - ret = np.zeros(nelems, dtype=np.complex) + ret = np.zeros(nelems, dtype=np.complex128) f.read(16) for i in range(nelems): re = unpack("d", f.read(8))[0] im = unpack("d", f.read(8))[0] - ret[i] = np.complex(re, im) + ret[i] = complex(re, im) return ret diff --git a/samples/tutorial_2.1/Finite.py b/samples/tutorial_2.1/Finite.py index 3135cefa..596e00a7 100644 --- a/samples/tutorial_2.1/Finite.py +++ b/samples/tutorial_2.1/Finite.py @@ -8,7 +8,7 @@ data = f.read() data = data.split("\n") max_eigen = len(data)-1 - Energy = np.zeros([max_eigen],dtype=np.float) + Energy = np.zeros([max_eigen],dtype=np.float64) print("max_eigen= ", max_eigen) #[s] count not empty elements cnt = 0 diff --git a/samples/tutorial_2.1/Norm_TPQ.py b/samples/tutorial_2.1/Norm_TPQ.py index 9ea8056b..110e21dd 100644 --- a/samples/tutorial_2.1/Norm_TPQ.py +++ b/samples/tutorial_2.1/Norm_TPQ.py @@ -34,7 +34,7 @@ def mainBasic(num_sample,dir_Norm): phys_Z,phys_Ene,phys_Ene2,phys_Sz,phys_Sz2,phys_InvTemp = CalcBasic(Norm,Ene,Ene2,Sz,Sz2,InvTemp,tpq_type) - log_Z = np.zeros([num_step],dtype=np.float) + log_Z = np.zeros([num_step],dtype=np.float64) with open("%s/Norm.dat" % (dir_Norm),'w') as f: tmp_log_Z = -math.log(Norm[0][0]) for k in range(0,num_step): @@ -79,14 +79,14 @@ def read_file(num_sample): data = f.read() data = data.split("\n") num_step = int(len(data)-2) - Norm = np.zeros([num_sample,num_step],dtype=np.float) - InvTemp = np.zeros([num_sample,num_step],dtype=np.float) - Ene = np.zeros([num_sample,num_step],dtype=np.float) - Ene2 = np.zeros([num_sample,num_step],dtype=np.float) - Spc = np.zeros([num_sample,num_step],dtype=np.float) - Sz = np.zeros([num_sample,num_step],dtype=np.float) - Sz2 = np.zeros([num_sample,num_step],dtype=np.float) - chi = np.zeros([num_sample,num_step],dtype=np.float) + Norm = np.zeros([num_sample,num_step],dtype=np.float64) + InvTemp = np.zeros([num_sample,num_step],dtype=np.float64) + Ene = np.zeros([num_sample,num_step],dtype=np.float64) + Ene2 = np.zeros([num_sample,num_step],dtype=np.float64) + Spc = np.zeros([num_sample,num_step],dtype=np.float64) + Sz = np.zeros([num_sample,num_step],dtype=np.float64) + Sz2 = np.zeros([num_sample,num_step],dtype=np.float64) + chi = np.zeros([num_sample,num_step],dtype=np.float64) for cnt_samp in range(num_sample): in_file = "output/Norm_rand%d.dat" % (cnt_samp) @@ -136,12 +136,12 @@ def CalcBasic(Norm,Ene,Ene2,Sz,Sz2,InvTemp,tpq_type): num_sample = Norm.shape[0] num_step = Norm.shape[1] print(num_step) - phys_InvTemp = np.zeros([num_sample,num_step],dtype=np.float) - phys_Z = np.zeros([num_sample,num_step],dtype=np.float) - phys_Ene = np.zeros([num_sample,num_step],dtype=np.float) - phys_Ene2 = np.zeros([num_sample,num_step],dtype=np.float) - phys_Sz = np.zeros([num_sample,num_step],dtype=np.float) - phys_Sz2 = np.zeros([num_sample,num_step],dtype=np.float) + phys_InvTemp = np.zeros([num_sample,num_step],dtype=np.float64) + phys_Z = np.zeros([num_sample,num_step],dtype=np.float64) + phys_Ene = np.zeros([num_sample,num_step],dtype=np.float64) + phys_Ene2 = np.zeros([num_sample,num_step],dtype=np.float64) + phys_Sz = np.zeros([num_sample,num_step],dtype=np.float64) + phys_Sz2 = np.zeros([num_sample,num_step],dtype=np.float64) #NB: cnt_samp=0, Z is always 1 for k in range(0,num_step): phys_Z[0][k] = 1.0 @@ -214,7 +214,7 @@ def CalcPhys(IPL_Z,IPL_InvTemp,Phys,tpq_type): num_step = Phys.shape[1] num_phys = Phys.shape[2] print(num_sample,num_step,num_phys) - Norm_Phys = np.zeros([num_sample,num_step,num_phys],dtype=np.float) + Norm_Phys = np.zeros([num_sample,num_step,num_phys],dtype=np.float64) for k in range(0,num_step): for cnt_phys in range(0,num_phys): Norm_Phys[0][k][cnt_phys] = Phys[0][k][cnt_phys] @@ -255,7 +255,7 @@ def read_phys(num_sample,dir_Phys,header): num_phys = len(tmp) print(num_step) print(num_phys) - Phys = np.zeros([num_sample,num_step,num_phys],dtype=np.float) + Phys = np.zeros([num_sample,num_step,num_phys],dtype=np.float64) for cnt_samp in range(num_sample): in_file = "%s/%s_set%d.dat" % (dir_Phys,header,cnt_samp) @@ -278,8 +278,8 @@ def read_Norm(num_sample,dir_Norm): data = data.split("\n") num_step = int(len(data)-2) print("num_step=",num_step) - IPL_Z = np.zeros([num_sample,num_step],dtype=np.float) - IPL_InvTemp = np.zeros([num_sample,num_step],dtype=np.float) + IPL_Z = np.zeros([num_sample,num_step],dtype=np.float64) + IPL_InvTemp = np.zeros([num_sample,num_step],dtype=np.float64) for cnt_samp in range(num_sample): in_file = "%s/TPQ_%d.dat" % (dir_Norm,cnt_samp) diff --git a/samples/tutorial_2.2/Finite.py b/samples/tutorial_2.2/Finite.py index 3135cefa..596e00a7 100644 --- a/samples/tutorial_2.2/Finite.py +++ b/samples/tutorial_2.2/Finite.py @@ -8,7 +8,7 @@ data = f.read() data = data.split("\n") max_eigen = len(data)-1 - Energy = np.zeros([max_eigen],dtype=np.float) + Energy = np.zeros([max_eigen],dtype=np.float64) print("max_eigen= ", max_eigen) #[s] count not empty elements cnt = 0 diff --git a/test/Ave_SS.py b/test/Ave_SS.py index c397a145..b43e2edd 100644 --- a/test/Ave_SS.py +++ b/test/Ave_SS.py @@ -14,30 +14,30 @@ def main(): #[e] read modpara # - Ref_ave_Temp = np.zeros([max_eigen],dtype=np.float) - Ref_err_Temp = np.zeros([max_eigen],dtype=np.float) - Ref_ave_Ene = np.zeros([max_eigen],dtype=np.float) - Ref_err_Ene = np.zeros([max_eigen],dtype=np.float) + Ref_ave_Temp = np.zeros([max_eigen],dtype=np.float64) + Ref_err_Temp = np.zeros([max_eigen],dtype=np.float64) + Ref_ave_Ene = np.zeros([max_eigen],dtype=np.float64) + Ref_err_Ene = np.zeros([max_eigen],dtype=np.float64) # - ave_Temp = np.zeros([max_eigen],dtype=np.float) - err_Temp = np.zeros([max_eigen],dtype=np.float) + ave_Temp = np.zeros([max_eigen],dtype=np.float64) + err_Temp = np.zeros([max_eigen],dtype=np.float64) # - InvTemp = np.zeros([max_set,max_eigen],dtype=np.float) - ave_InvTemp = np.zeros([max_eigen],dtype=np.float) - err_InvTemp = np.zeros([max_eigen],dtype=np.float) - Ene = np.zeros([max_set,max_eigen],dtype=np.float) - ave_Ene = np.zeros([max_eigen],dtype=np.float) - err_Ene = np.zeros([max_eigen],dtype=np.float) - Ene2 = np.zeros([max_set,max_eigen],dtype=np.float) - ave_Ene2 = np.zeros([max_eigen],dtype=np.float) - err_Ene2 = np.zeros([max_eigen],dtype=np.float) + InvTemp = np.zeros([max_set,max_eigen],dtype=np.float64) + ave_InvTemp = np.zeros([max_eigen],dtype=np.float64) + err_InvTemp = np.zeros([max_eigen],dtype=np.float64) + Ene = np.zeros([max_set,max_eigen],dtype=np.float64) + ave_Ene = np.zeros([max_eigen],dtype=np.float64) + err_Ene = np.zeros([max_eigen],dtype=np.float64) + Ene2 = np.zeros([max_set,max_eigen],dtype=np.float64) + ave_Ene2 = np.zeros([max_eigen],dtype=np.float64) + err_Ene2 = np.zeros([max_eigen],dtype=np.float64) # - Spc = np.zeros([max_set,max_eigen],dtype=np.float) - ave_Spc = np.zeros([max_eigen],dtype=np.float) - err_Spc = np.zeros([max_eigen],dtype=np.float) - Ent = np.zeros([max_set,max_eigen-1],dtype=np.float) - ave_Ent = np.zeros([max_eigen-1],dtype=np.float) - err_Ent = np.zeros([max_eigen-1],dtype=np.float) + Spc = np.zeros([max_set,max_eigen],dtype=np.float64) + ave_Spc = np.zeros([max_eigen],dtype=np.float64) + err_Spc = np.zeros([max_eigen],dtype=np.float64) + Ent = np.zeros([max_set,max_eigen-1],dtype=np.float64) + ave_Ent = np.zeros([max_eigen-1],dtype=np.float64) + err_Ent = np.zeros([max_eigen-1],dtype=np.float64) # for cnt_set in range(0,max_set): diff --git a/tool/ExpertSpin/MakeDef.py b/tool/ExpertSpin/MakeDef.py index b2456520..3824a43e 100644 --- a/tool/ExpertSpin/MakeDef.py +++ b/tool/ExpertSpin/MakeDef.py @@ -19,17 +19,17 @@ All_N = max_site #[e] set input. #[s] interaction -Ising = np.zeros([max_site,max_site],dtype=np.float) -Exchange = np.zeros([max_site,max_site],dtype=np.float) -PairLift = np.zeros([max_site,max_site],dtype=np.float) -InterAll = np.zeros([max_site,2,max_site,2,max_site,2,max_site,2],dtype=np.complex) +Ising = np.zeros([max_site,max_site],dtype=np.float64) +Exchange = np.zeros([max_site,max_site],dtype=np.float64) +PairLift = np.zeros([max_site,max_site],dtype=np.float64) +InterAll = np.zeros([max_site,2,max_site,2,max_site,2,max_site,2],dtype=np.complex128) #[e] interaction #[s] read pair.txt -siteI = np.zeros([num],dtype=np.int) -siteJ = np.zeros([num],dtype=np.int) -intT1 = np.zeros([num],dtype=np.unicode) -intT2 = np.zeros([num],dtype=np.unicode) -para = np.zeros([num],dtype=np.double) +siteI = np.zeros([num],dtype=np.int64) +siteJ = np.zeros([num],dtype=np.int64) +intT1 = np.zeros([num],dtype=np.unicode_) +intT2 = np.zeros([num],dtype=np.unicode_) +para = np.zeros([num],dtype=np.float64) read.func_readpair(tmp_sdt,siteI,siteJ,intT1,intT2,para) #[e] read pair.txt diff --git a/tool/FiniteT/Finite.py b/tool/FiniteT/Finite.py index 3135cefa..596e00a7 100644 --- a/tool/FiniteT/Finite.py +++ b/tool/FiniteT/Finite.py @@ -8,7 +8,7 @@ data = f.read() data = data.split("\n") max_eigen = len(data)-1 - Energy = np.zeros([max_eigen],dtype=np.float) + Energy = np.zeros([max_eigen],dtype=np.float64) print("max_eigen= ", max_eigen) #[s] count not empty elements cnt = 0 diff --git a/tool/ForSq/CalcSq.py b/tool/ForSq/CalcSq.py index 3226279b..467bb39b 100755 --- a/tool/ForSq/CalcSq.py +++ b/tool/ForSq/CalcSq.py @@ -29,8 +29,8 @@ #[e] initialize #[s] allocate -Sq = np.zeros([Lx+1,Ly+1],dtype=np.float) -Sq_err = np.zeros([Lx+1,Ly+1],dtype=np.float) +Sq = np.zeros([Lx+1,Ly+1],dtype=np.float64) +Sq_err = np.zeros([Lx+1,Ly+1],dtype=np.float64) #[e] allocate max_num = 1 for num_cg in range(0,max_num): From cc152879fb9e042ec9d72030b9826f0e53cafd32 Mon Sep 17 00:00:00 2001 From: Yuichi Motoyama Date: Wed, 22 Feb 2023 17:45:20 +0900 Subject: [PATCH 5/9] test on macos-11 instead of macos-10.05 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b5aeb0ad..ec27e2a7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: mpisize: [1, 4, 16] ompsize: [1, 3] include: - - os: macos-10.15 + - os: macos-11 mpisize: 1 ompsize: 1 - os: ubuntu-20.04 From 33dd743de33ebd11eff7d02864d409aa74c572ea Mon Sep 17 00:00:00 2001 From: Kazuyoshi Yoshimi Date: Thu, 1 Feb 2024 09:24:11 +0900 Subject: [PATCH 6/9] change python to python3 in tests for te --- test/te_hubbard_chain_interall.sh | 2 +- test/te_hubbard_chain_interall_diagonal.sh | 2 +- test/te_kondo_chain_interall.sh | 2 +- test/te_spin_chain_interall.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/te_hubbard_chain_interall.sh b/test/te_hubbard_chain_interall.sh index 41086348..ef56e09e 100755 --- a/test/te_hubbard_chain_interall.sh +++ b/test/te_hubbard_chain_interall.sh @@ -2,7 +2,7 @@ mkdir -p te_hubbard_chain_interall/ cd te_hubbard_chain_interall -python "$1/test/testTECalc.py" -p "../../src/HPhi" -mpi "${MPIRUN}" +python3 "$1/test/testTECalc.py" -p "../../src/HPhi" -mpi "${MPIRUN}" # Check value: flct cat > reference.dat < reference.dat < reference.dat < reference.dat < Date: Mon, 5 Feb 2024 10:49:35 +0900 Subject: [PATCH 7/9] update submodule:StdFace v0.5 --- src/StdFace | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/StdFace b/src/StdFace index 92967761..bfc57fb9 160000 --- a/src/StdFace +++ b/src/StdFace @@ -1 +1 @@ -Subproject commit 92967761b56e6ddf69b1039102dbf0d09256242c +Subproject commit bfc57fb9ddf515e11e6f9730201b0dce37c77db3 From 2d94f4a60af892370ecd7a3e5d0df46ef1e55902 Mon Sep 17 00:00:00 2001 From: Kazuyoshi Yoshimi Date: Wed, 6 Mar 2024 13:37:24 +0900 Subject: [PATCH 8/9] update version number --- doc/en/source/conf.py | 2 +- doc/en/source/introduction_en.rst | 2 ++ doc/ja/source/conf.py | 2 +- doc/ja/source/introduction_ja.rst | 2 ++ src/include/version_patch.h | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/en/source/conf.py b/doc/en/source/conf.py index 1d5bf24c..b29c4b8f 100644 --- a/doc/en/source/conf.py +++ b/doc/en/source/conf.py @@ -66,7 +66,7 @@ # The short X.Y version. version = '3.5' # The full version, including alpha/beta/rc tags. -release = u'3.5.1' +release = u'3.5.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/en/source/introduction_en.rst b/doc/en/source/introduction_en.rst index 46a2e9ac..39e47c40 100644 --- a/doc/en/source/introduction_en.rst +++ b/doc/en/source/introduction_en.rst @@ -31,6 +31,8 @@ Contributors This software was developed by the following contributors. +* ver.3.5.2 (released on 2024/3/07) + * ver.3.5.1 (released on 2022/6/14) * ver.3.5 (released on 2021/9/29) diff --git a/doc/ja/source/conf.py b/doc/ja/source/conf.py index ec48d675..287c6d23 100644 --- a/doc/ja/source/conf.py +++ b/doc/ja/source/conf.py @@ -64,7 +64,7 @@ # The short X.Y version. version = '3.5' # The full version, including alpha/beta/rc tags. -release = u'3.5.1' +release = u'3.5.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/ja/source/introduction_ja.rst b/doc/ja/source/introduction_ja.rst index 80b9ddff..9cc4a04f 100644 --- a/doc/ja/source/introduction_ja.rst +++ b/doc/ja/source/introduction_ja.rst @@ -57,6 +57,8 @@ What is :math:`{\mathcal H}\Phi`? 本ソフトウェアは以下の開発貢献者により開発されています。 +- ver.3.5.2 (2024/3/7 リリース) + - ver.3.5.1 (2022/6/14 リリース) - ver.3.5 (2021/9/29 リリース) diff --git a/src/include/version_patch.h b/src/include/version_patch.h index d00491fd..0cfbf088 100644 --- a/src/include/version_patch.h +++ b/src/include/version_patch.h @@ -1 +1 @@ -1 +2 From bd0737e87e2626123187fbadbc08a59e8c5a09f7 Mon Sep 17 00:00:00 2001 From: Yuichi Motoyama Date: Wed, 6 Mar 2024 14:03:20 +0900 Subject: [PATCH 9/9] use braket package in tutorial --- doc/tutorial/en/source/conf.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/tutorial/en/source/conf.py b/doc/tutorial/en/source/conf.py index 6105d0b0..2ea2fe57 100644 --- a/doc/tutorial/en/source/conf.py +++ b/doc/tutorial/en/source/conf.py @@ -156,6 +156,10 @@ u'University of Tokyo', 'manual', 'True'), ] +latex_elements = { + 'extrapackages': r'\usepackage{braket}' +} + # -- Options for manual page output --------------------------------------- # One entry per manual page. List of tuples