Skip to content

Commit 3046faf

Browse files
committed
Remove flex/bison from dockerfiles, should install correct versions via spack
1 parent 3164c70 commit 3046faf

24 files changed

Lines changed: 1 addition & 250 deletions

docker/Stanford/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ RUN yum install -y \
4949
make \
5050
bc \
5151
file \
52-
bison \
53-
flex \
5452
patch \
5553
ca-certificates \
5654
autoconf-2.69 \

docker/TotalEnergies/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ RUN yum install --disablerepo=intel-mkl-repo -y \
3838
make \
3939
bc \
4040
file \
41-
bison \
42-
flex \
4341
patch \
4442
ca-certificates \
4543
autoconf \

docker/TotalEnergies/Pangea3-base.Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ RUN dnf install -y \
1616
make \
1717
bc \
1818
file \
19-
# Scotch deps \
20-
bison \
21-
flex \
2219
# vtk deps \
2320
patch && \
2421
git-lfs install #&& alternatives --set python /usr/bin/python3

docker/TotalEnergies/Pangea3.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN dnf clean all && \
1616
dnf -y install \
1717
autoconf \
1818
automake \
19+
gettext-devel \
1920
libtool \
2021
bzip2 \
2122
unzip

docker/pangea-spack.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ spack:
2525
target: ppc64le
2626
modules: []
2727
environment:
28-
set: # Needed for scotch
29-
BISON: bison
30-
FLEX: flex
3128
prepend_path:
3229
LD_LIBRARY_PATH: /data_local/sw/lsf/10.1/linux3.10-glibc2.17-ppc64le/lib
3330
extra_rpaths: []
@@ -89,11 +86,6 @@ spack:
8986
- spec: automake@1.16.1
9087
prefix: /usr
9188
buildable: false
92-
bison:
93-
externals:
94-
- spec: bison@3.0.4
95-
prefix: /usr
96-
buildable: false
9789
bzip2:
9890
externals:
9991
- spec: bzip2@1.0.6
@@ -109,11 +101,6 @@ spack:
109101
- spec: cuda@11.5.0 +allow-unsupported-compilers
110102
prefix: /data_local/sw/cuda/11.5.0
111103
buildable: false
112-
flex:
113-
externals:
114-
- spec: flex@2.6.1+lex
115-
prefix: /usr
116-
buildable: false
117104
gettext:
118105
externals:
119106
- spec: gettext@0.19.8.1

docker/pecan-spack.yaml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ spack:
1515
compilers::
1616
# Pecan CPU/GPU compiler
1717
- compiler:
18-
environment:
19-
set: # Needed for scotch
20-
BISON: bison
21-
FLEX: flex
2218
extra_rpaths: []
2319
flags:
2420
cflags: -pthread
@@ -92,12 +88,6 @@ spack:
9288
externals:
9389
- spec: automake@1.16.5
9490
prefix: /usr
95-
bison:
96-
version: [3.8.2]
97-
buildable: false
98-
externals:
99-
- spec: bison@3.8.2
100-
prefix: /usr
10191
cmake:
10292
version: [3.28.3]
10393
buildable: false
@@ -109,12 +99,6 @@ spack:
10999
externals:
110100
- spec: cuda@11.5.1 +allow-unsupported-compilers
111101
prefix: /hrtc/apps/cuda/11.5.119/x86_64/centos7
112-
flex:
113-
version: [2.6.4]
114-
buildable: false
115-
externals:
116-
- spec: flex@2.6.4
117-
prefix: /usr
118102

119103
# Lock down blas, lapack implementation
120104
intel-mkl:

docker/rocky-spack.yaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ spack:
1414

1515
compilers::
1616
- compiler:
17-
environment:
18-
set: # Needed for scotch
19-
BISON: bison
20-
FLEX: flex
2117
extra_rpaths: []
2218
flags:
2319
cflags: -pthread
@@ -32,10 +28,6 @@ spack:
3228
spec: clang@17.0.6
3329
target: x86_64
3430
- compiler:
35-
environment:
36-
set: # Needed for scotch
37-
BISON: bison
38-
FLEX: flex
3931
extra_rpaths: []
4032
flags:
4133
cflags: -pthread
@@ -109,12 +101,6 @@ spack:
109101
externals:
110102
- spec: automake@1.16.5
111103
prefix: /usr
112-
bison:
113-
version: [3.8.2]
114-
buildable: false
115-
externals:
116-
- spec: bison@3.8.2
117-
prefix: /usr
118104
cmake:
119105
version: [3.28.6]
120106
buildable: false
@@ -128,12 +114,6 @@ spack:
128114
prefix: /usr/local/cuda
129115
- spec: cuda@12.6.3%clang@17.0.6 +allow-unsupported-compilers
130116
prefix: /usr/local/cuda
131-
flex:
132-
version: [2.6.4]
133-
buildable: false
134-
externals:
135-
- spec: flex@2.6.4
136-
prefix: /usr
137117
m4:
138118
buildable: false
139119
externals:

docker/spack.yaml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ spack:
1414

1515
compilers::
1616
- compiler:
17-
environment:
18-
set: # Needed for scotch
19-
BISON: bison
20-
FLEX: flex
2117
extra_rpaths: []
2218
flags: {}
2319
modules: []
@@ -30,10 +26,6 @@ spack:
3026
spec: clang@15
3127
target: x86_64
3228
- compiler:
33-
environment:
34-
set: # Needed for scotch
35-
BISON: bison
36-
FLEX: flex
3729
extra_rpaths: []
3830
flags: {}
3931
modules: []
@@ -46,10 +38,6 @@ spack:
4638
spec: clang@10
4739
target: x86_64
4840
- compiler:
49-
environment:
50-
set: # Needed for scotch
51-
BISON: bison
52-
FLEX: flex
5341
extra_rpaths: []
5442
flags:
5543
cflags: -pthread
@@ -64,10 +52,6 @@ spack:
6452
spec: gcc@12
6553
target: x86_64
6654
- compiler:
67-
environment:
68-
set: # Needed for scotch
69-
BISON: bison
70-
FLEX: flex
7155
extra_rpaths: []
7256
flags:
7357
cflags: -pthread
@@ -82,10 +66,6 @@ spack:
8266
spec: gcc@11
8367
target: x86_64
8468
- compiler:
85-
environment:
86-
set: # Needed for scotch
87-
BISON: bison
88-
FLEX: flex
8969
extra_rpaths: []
9070
flags:
9171
cflags: -pthread
@@ -100,10 +80,6 @@ spack:
10080
spec: gcc@10
10181
target: x86_64
10282
- compiler:
103-
environment:
104-
set: # Needed for scotch
105-
BISON: bison
106-
FLEX: flex
10783
extra_rpaths: []
10884
flags:
10985
cflags: -pthread
@@ -118,10 +94,6 @@ spack:
11894
spec: gcc@9
11995
target: x86_64
12096
- compiler:
121-
environment:
122-
set: # Needed for scotch
123-
BISON: bison
124-
FLEX: flex
12597
extra_rpaths: []
12698
flags:
12799
cflags: -pthread
@@ -195,12 +167,6 @@ spack:
195167
externals:
196168
- spec: automake@1.16.5
197169
prefix: /usr
198-
bison:
199-
version: [3.8.2]
200-
buildable: false
201-
externals:
202-
- spec: bison@3.8.2
203-
prefix: /usr
204170
cmake:
205171
version: [3.28.3]
206172
buildable: false
@@ -212,12 +178,6 @@ spack:
212178
externals:
213179
- spec: cuda@11.8.0 +allow-unsupported-compilers
214180
prefix: /usr/local/cuda
215-
flex:
216-
version: [2.6.4]
217-
buildable: false
218-
externals:
219-
- spec: flex@2.6.4
220-
prefix: /usr
221181
findutils:
222182
version: [4.7.0]
223183
buildable: false

docker/stanford-spack.yaml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ spack:
2828
cflags: -pthread
2929
cxxflags: -pthread
3030
modules: []
31-
environment:
32-
set: # Needed for scotch
33-
BISON: bison
34-
FLEX: flex
3531
extra_rpaths: []
3632

3733
packages:
@@ -92,13 +88,6 @@ spack:
9288
- spec: automake@1.13.4
9389
prefix: /usr
9490

95-
bison:
96-
version: [3.0.4]
97-
buildable: false
98-
externals:
99-
- spec: bison@3.0.4
100-
prefix: /usr
101-
10291
cmake:
10392
buildable: false
10493
externals:
@@ -117,12 +106,6 @@ spack:
117106
# - spec: diffutils@3.3
118107
# prefix: /usr
119108

120-
flex:
121-
buildable: false
122-
externals:
123-
- spec: flex@2.5.37
124-
prefix: /usr
125-
126109
#gettext:
127110
# buildable: false
128111
# externals:

docker/tpl-centos-gcc-cuda.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ RUN yum install -y \
6666
make \
6767
bc \
6868
file \
69-
bison \
70-
flex \
7169
patch \
7270
ca-certificates \
7371
autoconf \

0 commit comments

Comments
 (0)