Skip to content

Commit 646f7a6

Browse files
smoorssmoors
committed
more test fixes
1 parent 3f05f7e commit 646f7a6

File tree

2 files changed

+92
-41
lines changed

2 files changed

+92
-41
lines changed

‎test/framework/modules.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555

5656
# number of modules included for testing purposes
57-
TEST_MODULES_COUNT = 92
57+
TEST_MODULES_COUNT = 110
5858

5959

6060
class ModulesTest(EnhancedTestCase):

‎test/framework/toolchain.py‎

Lines changed: 91 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1840,46 +1840,97 @@ def test_old_new_iccifort(self):
18401840
scalapack_mt_static_libs_fosscuda = "libscalapack.a,libopenblas.a,libgfortran.a,libpthread.a"
18411841
scalapack_mt_shared_libs_fosscuda = scalapack_mt_static_libs_fosscuda.replace('.a', '.' + shlib_ext)
18421842

1843-
for toolc in [('fosscuda', '2018a'), ('foss', '2023a')]:
1844-
tc = self.get_toolchain(toolc[0], version=toolc[1])
1845-
tc.prepare()
1846-
self.assertEqual(os.environ['BLAS_SHARED_LIBS'], blas_shared_libs_fosscuda)
1847-
self.assertEqual(os.environ['BLAS_STATIC_LIBS'], blas_static_libs_fosscuda)
1848-
self.assertEqual(os.environ['BLAS_MT_SHARED_LIBS'], blas_mt_shared_libs_fosscuda)
1849-
self.assertEqual(os.environ['BLAS_MT_STATIC_LIBS'], blas_mt_static_libs_fosscuda)
1850-
self.assertEqual(os.environ['LIBBLAS'], libblas_fosscuda)
1851-
self.assertEqual(os.environ['LIBBLAS_MT'], libblas_mt_fosscuda)
1852-
1853-
self.assertEqual(os.environ['LAPACK_SHARED_LIBS'], lapack_shared_libs_fosscuda)
1854-
self.assertEqual(os.environ['LAPACK_STATIC_LIBS'], lapack_static_libs_fosscuda)
1855-
self.assertEqual(os.environ['LAPACK_MT_SHARED_LIBS'], lapack_mt_shared_libs_fosscuda)
1856-
self.assertEqual(os.environ['LAPACK_MT_STATIC_LIBS'], lapack_mt_static_libs_fosscuda)
1857-
self.assertEqual(os.environ['LIBLAPACK'], liblapack_fosscuda)
1858-
self.assertEqual(os.environ['LIBLAPACK_MT'], liblapack_mt_fosscuda)
1859-
1860-
self.assertEqual(os.environ['BLAS_LAPACK_SHARED_LIBS'], blas_shared_libs_fosscuda)
1861-
self.assertEqual(os.environ['BLAS_LAPACK_STATIC_LIBS'], blas_static_libs_fosscuda)
1862-
self.assertEqual(os.environ['BLAS_LAPACK_MT_SHARED_LIBS'], blas_mt_shared_libs_fosscuda)
1863-
self.assertEqual(os.environ['BLAS_LAPACK_MT_STATIC_LIBS'], blas_mt_static_libs_fosscuda)
1864-
1865-
self.assertEqual(os.environ['FFT_SHARED_LIBS'], fft_shared_libs_fosscuda)
1866-
self.assertEqual(os.environ['FFT_STATIC_LIBS'], fft_static_libs_fosscuda)
1867-
self.assertEqual(os.environ['FFT_SHARED_LIBS_MT'], fft_mt_shared_libs_fosscuda)
1868-
self.assertEqual(os.environ['FFT_STATIC_LIBS_MT'], fft_mt_static_libs_fosscuda)
1869-
self.assertEqual(os.environ['FFTW_SHARED_LIBS'], fft_shared_libs_fosscuda)
1870-
self.assertEqual(os.environ['FFTW_STATIC_LIBS'], fft_static_libs_fosscuda)
1871-
self.assertEqual(os.environ['FFTW_SHARED_LIBS_MT'], fft_mt_shared_libs_fosscuda)
1872-
self.assertEqual(os.environ['FFTW_STATIC_LIBS_MT'], fft_mt_static_libs_fosscuda)
1873-
self.assertEqual(os.environ['LIBFFT'], libfft_fosscuda)
1874-
self.assertEqual(os.environ['LIBFFT_MT'], libfft_mt_fosscuda)
1875-
1876-
self.assertEqual(os.environ['LIBSCALAPACK'], libscalack_fosscuda)
1877-
self.assertEqual(os.environ['LIBSCALAPACK_MT'], libscalack_mt_fosscuda)
1878-
self.assertEqual(os.environ['SCALAPACK_SHARED_LIBS'], scalapack_shared_libs_fosscuda)
1879-
self.assertEqual(os.environ['SCALAPACK_STATIC_LIBS'], scalapack_static_libs_fosscuda)
1880-
self.assertEqual(os.environ['SCALAPACK_MT_SHARED_LIBS'], scalapack_mt_shared_libs_fosscuda)
1881-
self.assertEqual(os.environ['SCALAPACK_MT_STATIC_LIBS'], scalapack_mt_static_libs_fosscuda)
1882-
self.modtool.purge()
1843+
tc = self.get_toolchain('fosscuda', version='2018a')
1844+
tc.prepare()
1845+
self.assertEqual(os.environ['BLAS_SHARED_LIBS'], blas_shared_libs_fosscuda)
1846+
self.assertEqual(os.environ['BLAS_STATIC_LIBS'], blas_static_libs_fosscuda)
1847+
self.assertEqual(os.environ['BLAS_MT_SHARED_LIBS'], blas_mt_shared_libs_fosscuda)
1848+
self.assertEqual(os.environ['BLAS_MT_STATIC_LIBS'], blas_mt_static_libs_fosscuda)
1849+
self.assertEqual(os.environ['LIBBLAS'], libblas_fosscuda)
1850+
self.assertEqual(os.environ['LIBBLAS_MT'], libblas_mt_fosscuda)
1851+
1852+
self.assertEqual(os.environ['LAPACK_SHARED_LIBS'], lapack_shared_libs_fosscuda)
1853+
self.assertEqual(os.environ['LAPACK_STATIC_LIBS'], lapack_static_libs_fosscuda)
1854+
self.assertEqual(os.environ['LAPACK_MT_SHARED_LIBS'], lapack_mt_shared_libs_fosscuda)
1855+
self.assertEqual(os.environ['LAPACK_MT_STATIC_LIBS'], lapack_mt_static_libs_fosscuda)
1856+
self.assertEqual(os.environ['LIBLAPACK'], liblapack_fosscuda)
1857+
self.assertEqual(os.environ['LIBLAPACK_MT'], liblapack_mt_fosscuda)
1858+
1859+
self.assertEqual(os.environ['BLAS_LAPACK_SHARED_LIBS'], blas_shared_libs_fosscuda)
1860+
self.assertEqual(os.environ['BLAS_LAPACK_STATIC_LIBS'], blas_static_libs_fosscuda)
1861+
self.assertEqual(os.environ['BLAS_LAPACK_MT_SHARED_LIBS'], blas_mt_shared_libs_fosscuda)
1862+
self.assertEqual(os.environ['BLAS_LAPACK_MT_STATIC_LIBS'], blas_mt_static_libs_fosscuda)
1863+
1864+
self.assertEqual(os.environ['FFT_SHARED_LIBS'], fft_shared_libs_fosscuda)
1865+
self.assertEqual(os.environ['FFT_STATIC_LIBS'], fft_static_libs_fosscuda)
1866+
self.assertEqual(os.environ['FFT_SHARED_LIBS_MT'], fft_mt_shared_libs_fosscuda)
1867+
self.assertEqual(os.environ['FFT_STATIC_LIBS_MT'], fft_mt_static_libs_fosscuda)
1868+
self.assertEqual(os.environ['FFTW_SHARED_LIBS'], fft_shared_libs_fosscuda)
1869+
self.assertEqual(os.environ['FFTW_STATIC_LIBS'], fft_static_libs_fosscuda)
1870+
self.assertEqual(os.environ['FFTW_SHARED_LIBS_MT'], fft_mt_shared_libs_fosscuda)
1871+
self.assertEqual(os.environ['FFTW_STATIC_LIBS_MT'], fft_mt_static_libs_fosscuda)
1872+
self.assertEqual(os.environ['LIBFFT'], libfft_fosscuda)
1873+
self.assertEqual(os.environ['LIBFFT_MT'], libfft_mt_fosscuda)
1874+
1875+
self.assertEqual(os.environ['LIBSCALAPACK'], libscalack_fosscuda)
1876+
self.assertEqual(os.environ['LIBSCALAPACK_MT'], libscalack_mt_fosscuda)
1877+
self.assertEqual(os.environ['SCALAPACK_SHARED_LIBS'], scalapack_shared_libs_fosscuda)
1878+
self.assertEqual(os.environ['SCALAPACK_STATIC_LIBS'], scalapack_static_libs_fosscuda)
1879+
self.assertEqual(os.environ['SCALAPACK_MT_SHARED_LIBS'], scalapack_mt_shared_libs_fosscuda)
1880+
self.assertEqual(os.environ['SCALAPACK_MT_STATIC_LIBS'], scalapack_mt_static_libs_fosscuda)
1881+
self.modtool.purge()
1882+
1883+
tc = self.get_toolchain('foss', version='2023a')
1884+
tc.prepare()
1885+
self.assertEqual(os.environ['BLAS_SHARED_LIBS'], blas_shared_libs_fosscuda.replace('openblas', 'flexiblas'))
1886+
self.assertEqual(os.environ['BLAS_STATIC_LIBS'], blas_static_libs_fosscuda.replace('openblas', 'flexiblas'))
1887+
self.assertEqual(os.environ['BLAS_MT_SHARED_LIBS'],
1888+
blas_mt_shared_libs_fosscuda.replace('openblas', 'flexiblas'))
1889+
self.assertEqual(os.environ['BLAS_MT_STATIC_LIBS'],
1890+
blas_mt_static_libs_fosscuda.replace('openblas', 'flexiblas'))
1891+
self.assertEqual(os.environ['LIBBLAS'], libblas_fosscuda.replace('openblas', 'flexiblas'))
1892+
self.assertEqual(os.environ['LIBBLAS_MT'], libblas_mt_fosscuda.replace('openblas', 'flexiblas'))
1893+
1894+
self.assertEqual(os.environ['LAPACK_SHARED_LIBS'], lapack_shared_libs_fosscuda.replace('openblas', 'flexiblas'))
1895+
self.assertEqual(os.environ['LAPACK_STATIC_LIBS'], lapack_static_libs_fosscuda.replace('openblas', 'flexiblas'))
1896+
self.assertEqual(os.environ['LAPACK_MT_SHARED_LIBS'],
1897+
lapack_mt_shared_libs_fosscuda.replace('openblas', 'flexiblas'))
1898+
self.assertEqual(os.environ['LAPACK_MT_STATIC_LIBS'],
1899+
lapack_mt_static_libs_fosscuda.replace('openblas', 'flexiblas'))
1900+
self.assertEqual(os.environ['LIBLAPACK'], liblapack_fosscuda.replace('openblas', 'flexiblas'))
1901+
self.assertEqual(os.environ['LIBLAPACK_MT'], liblapack_mt_fosscuda.replace('openblas', 'flexiblas'))
1902+
1903+
self.assertEqual(os.environ['BLAS_LAPACK_SHARED_LIBS'],
1904+
blas_shared_libs_fosscuda.replace('openblas', 'flexiblas'))
1905+
self.assertEqual(os.environ['BLAS_LAPACK_STATIC_LIBS'],
1906+
blas_static_libs_fosscuda.replace('openblas', 'flexiblas'))
1907+
self.assertEqual(os.environ['BLAS_LAPACK_MT_SHARED_LIBS'],
1908+
blas_mt_shared_libs_fosscuda.replace('openblas', 'flexiblas'))
1909+
self.assertEqual(os.environ['BLAS_LAPACK_MT_STATIC_LIBS'],
1910+
blas_mt_static_libs_fosscuda.replace('openblas', 'flexiblas'))
1911+
1912+
self.assertEqual(os.environ['FFT_SHARED_LIBS'], fft_shared_libs_fosscuda)
1913+
self.assertEqual(os.environ['FFT_STATIC_LIBS'], fft_static_libs_fosscuda)
1914+
self.assertEqual(os.environ['FFT_SHARED_LIBS_MT'], fft_mt_shared_libs_fosscuda)
1915+
self.assertEqual(os.environ['FFT_STATIC_LIBS_MT'], fft_mt_static_libs_fosscuda)
1916+
self.assertEqual(os.environ['FFTW_SHARED_LIBS'], fft_shared_libs_fosscuda)
1917+
self.assertEqual(os.environ['FFTW_STATIC_LIBS'], fft_static_libs_fosscuda)
1918+
self.assertEqual(os.environ['FFTW_SHARED_LIBS_MT'], fft_mt_shared_libs_fosscuda)
1919+
self.assertEqual(os.environ['FFTW_STATIC_LIBS_MT'], fft_mt_static_libs_fosscuda)
1920+
self.assertEqual(os.environ['LIBFFT'], libfft_fosscuda)
1921+
self.assertEqual(os.environ['LIBFFT_MT'], libfft_mt_fosscuda)
1922+
1923+
self.assertEqual(os.environ['LIBSCALAPACK'], libscalack_fosscuda.replace('openblas', 'flexiblas'))
1924+
self.assertEqual(os.environ['LIBSCALAPACK_MT'], libscalack_mt_fosscuda.replace('openblas', 'flexiblas'))
1925+
self.assertEqual(os.environ['SCALAPACK_SHARED_LIBS'],
1926+
scalapack_shared_libs_fosscuda.replace('openblas', 'flexiblas'))
1927+
self.assertEqual(os.environ['SCALAPACK_STATIC_LIBS'],
1928+
scalapack_static_libs_fosscuda.replace('openblas', 'flexiblas'))
1929+
self.assertEqual(os.environ['SCALAPACK_MT_SHARED_LIBS'],
1930+
scalapack_mt_shared_libs_fosscuda.replace('openblas', 'flexiblas'))
1931+
self.assertEqual(os.environ['SCALAPACK_MT_STATIC_LIBS'],
1932+
scalapack_mt_static_libs_fosscuda.replace('openblas', 'flexiblas'))
1933+
self.modtool.purge()
18831934

18841935
tc = self.get_toolchain('intel', version='2018a')
18851936
tc.prepare()

0 commit comments

Comments
 (0)