From 99ab1a53c36ab70a5592e6196a0a5855ac2d9f23 Mon Sep 17 00:00:00 2001
From: andrzejnovak <novak5andrzej@gmail.com>
Date: Fri, 2 Apr 2021 00:20:39 +0200
Subject: [PATCH] fix: update conda with Eigen (thanks @maxgalli), add frozen
 env yml

---
 Makefile_conda      |   2 +-
 conda_env.yml       |   1 +
 conda_env_exact.yml | 204 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 206 insertions(+), 1 deletion(-)
 create mode 100644 conda_env_exact.yml

diff --git a/Makefile_conda b/Makefile_conda
index 94dba8fd088..bfe437c6395 100644
--- a/Makefile_conda
+++ b/Makefile_conda
@@ -29,7 +29,7 @@ ROOTCFLAGS = $(shell root-config --cflags)
 ROOTLIBS = $(shell root-config --libs --glibs)
 ROOTINC = $(shell root-config --incdir)
 
-CCFLAGS = -D STANDALONE $(ROOTCFLAGS) -I$(CONDA)/include/boost -I$(CONDA)/include/vdt -I$(CONDA)/include/gsl -g -fPIC
+CCFLAGS = -D STANDALONE $(ROOTCFLAGS) -I$(CONDA)/include/boost -I$(CONDA)/include/vdt -I$(CONDA)/include/gsl -I$(CONDA)/include/eigen3 -g -fPIC
 # CMSSW CXXFLAGS plus -Wno-unused-local-typedefs (otherwise we get a flood of messages from BOOST) plus -Wno-unused-function
 CCFLAGS += -O2 -pthread -pipe -Werror=main -Werror=pointer-arith -Werror=overlength-strings -Wno-vla -Werror=overflow -std=c++1z -ftree-vectorize -Wstrict-overflow -Werror=array-bounds -Werror=format-contains-nul -Werror=type-limits -fvisibility-inlines-hidden -fno-math-errno --param vect-max-version-for-alias-checks=50 -Xassembler --compress-debug-sections -msse3 -felide-constructors -fmessage-length=0 -Wall -Wno-non-template-friend -Wno-long-long -Wreturn-type -Wunused -Wparentheses -Wno-deprecated -Werror=return-type -Werror=missing-braces -Werror=unused-value -Werror=address -Werror=format -Werror=sign-compare -Werror=write-strings -Werror=delete-non-virtual-dtor -Werror=strict-aliasing -Werror=narrowing -Werror=unused-but-set-variable -Werror=reorder -Werror=unused-variable -Werror=conversion-null -Werror=return-local-addr -Wnon-virtual-dtor -Werror=switch -fdiagnostics-show-option -Wno-unused-local-typedefs -Wno-attributes -Wno-psabi -Wno-error=unused-variable -DBOOST_DISABLE_ASSERTS -DGNU_GCC -D_GNU_SOURCE -DBOOST_SPIRIT_THREADSAFE -DPHOENIX_THREADSAFE
 LIBS = $(ROOTLIBS) -L$(CONDA)/lib -lgsl -l RooFit -lRooFitCore -l RooStats -l Minuit -lMathMore -l Foam -lHistFactory -lboost_filesystem -lboost_program_options -lboost_system -lvdt -lquadmath
diff --git a/conda_env.yml b/conda_env.yml
index 8c058cb9540..6a26e629413 100644
--- a/conda_env.yml
+++ b/conda_env.yml
@@ -11,4 +11,5 @@ dependencies:
   - vdt
   - boost
   - pcre
+  - eigen
   - certifi[version='>=2017.4.17']
diff --git a/conda_env_exact.yml b/conda_env_exact.yml
new file mode 100644
index 00000000000..d0e8b2fa074
--- /dev/null
+++ b/conda_env_exact.yml
@@ -0,0 +1,204 @@
+name: combine2
+channels:
+  - conda-forge
+  - defaults
+dependencies:
+  - _libgcc_mutex=0.1=conda_forge
+  - _openmp_mutex=4.5=1_llvm
+  - afterimage=1.21=ha9998ff_1003
+  - atk-1.0=2.36.0=h3371d22_4
+  - attrs=20.3.0=pyhd3deb0d_0
+  - backports=1.0=py27_1
+  - backports.functools_lru_cache=1.6.3=pyhd3eb1b0_0
+  - backports.shutil_get_terminal_size=1.0.0=py27_1
+  - backports_abc=0.5=py27_0
+  - binutils=2.34=h2122c62_9
+  - binutils_impl_linux-64=2.34=h53a641e_7
+  - binutils_linux-64=2.34=hc952b39_18
+  - blas=1.0=mkl
+  - bleach=3.3.0=pyh44b312d_0
+  - boost=1.72.0=py27h9de70de_0
+  - boost-cpp=1.72.0=h9d3c048_4
+  - bzip2=1.0.8=h7f98852_4
+  - c-ares=1.17.1=h7f98852_1
+  - c-compiler=1.1.1=h516909a_0
+  - ca-certificates=2021.1.19=h06a4308_1
+  - cairo=1.16.0=h6cf1ce9_1008
+  - certifi=2020.6.20=pyhd3eb1b0_3
+  - cffi=1.14.0=py27he30daa8_1
+  - cfitsio=3.470=hce51eda_7
+  - compilers=1.1.1=0
+  - configparser=4.0.2=py27_0
+  - contextlib2=0.6.0.post1=py_0
+  - cxx-compiler=1.1.1=hc9558a2_0
+  - davix=0.7.6=hece831a_0
+  - decorator=4.4.2=py_0
+  - defusedxml=0.7.1=pyhd3eb1b0_0
+  - eigen=3.3.9=h4bd325d_1
+  - entrypoints=0.3=py27h8c360ce_1001
+  - enum34=1.1.10=py27h8c360ce_1
+  - expat=2.3.0=h9c3ff4c_0
+  - fftw=3.3.9=h27cfd23_1
+  - font-ttf-dejavu-sans-mono=2.37=hab24e00_0
+  - font-ttf-inconsolata=2.001=hab24e00_0
+  - font-ttf-source-code-pro=2.030=hab24e00_0
+  - font-ttf-ubuntu=0.83=hab24e00_0
+  - fontconfig=2.13.1=hba837de_1004
+  - fonts-conda-ecosystem=1=0
+  - fonts-conda-forge=1=0
+  - fortran-compiler=1.1.1=he991be0_0
+  - freetype=2.10.4=h0708190_1
+  - fribidi=1.0.10=h516909a_0
+  - ftgl=2.4.0=hc56bac0_0
+  - funcsigs=1.0.2=py27_0
+  - functools32=3.2.3.2=py27_2
+  - futures=3.3.0=py27h8c360ce_1
+  - gcc_impl_linux-64=7.3.0=habb00fd_1
+  - gcc_linux-64=7.3.0=h553295d_18
+  - gdk-pixbuf=2.42.4=h04a7f16_2
+  - gettext=0.20.2=hf68c758_0
+  - gfortran_impl_linux-64=7.3.0=hdf63c60_1
+  - gfortran_linux-64=7.3.0=h553295d_18
+  - giflib=5.2.1=h516909a_2
+  - gl2ps=1.4.2=he06d7ca_0
+  - glew=2.1.0=h9c3ff4c_2
+  - graphite2=1.3.14=h23475e2_0
+  - graphviz=2.47.0=he056042_1
+  - gsl=2.6=he838d99_2
+  - gsoap_abi=2.8.109=ha770c72_0
+  - gtk2=2.24.33=hab0c2f8_0
+  - gts=0.7.6=h64030ff_2
+  - gxx_impl_linux-64=7.3.0=hdf63c60_1
+  - gxx_linux-64=7.3.0=h553295d_18
+  - harfbuzz=2.8.0=h83ec7ef_1
+  - icu=68.1=h58526e2_0
+  - importlib_metadata=1.5.0=py27_0
+  - ipaddress=1.0.23=py_0
+  - ipykernel=4.10.0=py27_1
+  - ipyparallel=6.2.4=py27_0
+  - ipython=5.8.0=py27_1
+  - ipython_genutils=0.2.0=py27_0
+  - jinja2=2.11.3=pyh44b312d_0
+  - jpeg=9d=h516909a_0
+  - jsonschema=3.2.0=py27h8c360ce_1
+  - jupyter_client=5.3.4=py27_1
+  - jupyter_core=4.6.3=py27h8c360ce_1
+  - krb5=1.17.2=h926e7f8_0
+  - ld_impl_linux-64=2.34=h53a641e_7
+  - libblas=3.9.0=8_mkl
+  - libcblas=3.9.0=8_mkl
+  - libcurl=7.76.0=hc4aaa36_0
+  - libcxx=10.0.1=hc9558a2_0
+  - libcxxabi=10.0.1=0
+  - libedit=3.1.20210216=h27cfd23_1
+  - libev=4.33=h516909a_1
+  - libffi=3.3=h58526e2_2
+  - libgcc-ng=9.3.0=h2828fa1_18
+  - libgd=2.3.2=h78a0170_0
+  - libgfortran-ng=7.5.0=h14aa051_18
+  - libgfortran4=7.5.0=h14aa051_18
+  - libglib=2.68.0=h3e27bee_2
+  - libglu=9.0.0=he1b5a44_1001
+  - libiconv=1.16=h516909a_0
+  - libllvm8=8.0.1=hc9558a2_0
+  - libnghttp2=1.43.0=h812cca2_0
+  - libpng=1.6.37=hed695b0_2
+  - librsvg=2.50.3=hfa39831_1
+  - libsodium=1.0.17=h516909a_0
+  - libssh2=1.9.0=ha56f1ee_6
+  - libstdcxx-ng=9.3.0=h6de172a_18
+  - libtiff=4.2.0=hdc55705_0
+  - libtool=2.4.6=h58526e2_1007
+  - libuuid=2.32.1=h14c3975_1000
+  - libwebp=1.2.0=h3452ae3_0
+  - libwebp-base=1.2.0=h7f98852_2
+  - libxcb=1.14=h7b6447c_0
+  - libxml2=2.9.10=h72842e0_3
+  - llvm-openmp=11.1.0=h4bd325d_0
+  - llvmlite=0.31.0=py27h5ee40b5_1
+  - lz4-c=1.9.2=he1b5a44_3
+  - markupsafe=1.1.1=py27hdf8410d_1
+  - metakernel=0.27.5=pyhd3deb0d_0
+  - mistune=0.8.4=py27hdf8410d_1001
+  - mkl=2020.4=h726a3e6_304
+  - mkl-service=2.3.0=py27he904b0f_0
+  - mkl_fft=1.0.15=py27ha843d7b_0
+  - mkl_random=1.1.0=py27hd6b4f25_0
+  - more-itertools=5.0.0=py_0
+  - nbconvert=5.6.1=py27_0
+  - nbformat=4.4.0=py27_0
+  - ncurses=6.2=h58526e2_4
+  - notebook=5.7.10=py27_0
+  - numba=0.47.0=py27hb3f55d8_0
+  - numpy=1.16.6=py27hbc911f0_0
+  - numpy-base=1.16.6=py27hde5b4d6_0
+  - openssl=1.1.1k=h7f98852_0
+  - packaging=20.9=pyh44b312d_0
+  - pandoc=2.12=h7f98852_0
+  - pandocfilters=1.4.2=py27_0
+  - pango=1.42.4=h80147aa_5
+  - pathlib2=2.3.5=py27h8c360ce_1
+  - pcre=8.44=he1b5a44_0
+  - pexpect=4.8.0=py27h8c360ce_1
+  - pickleshare=0.7.5=py27h8c360ce_1001
+  - pip=20.1.1=pyh9f0ad1d_0
+  - pixman=0.40.0=h36c2ea0_0
+  - portalocker=1.5.2=py27h8c360ce_1
+  - prometheus_client=0.9.0=pyhd3deb0d_0
+  - prompt_toolkit=1.0.15=py27_0
+  - ptyprocess=0.7.0=pyhd3deb0d_0
+  - pycparser=2.20=pyh9f0ad1d_2
+  - pygments=2.5.2=py_0
+  - pyparsing=2.4.7=pyh9f0ad1d_0
+  - pyrsistent=0.15.7=py27hdf8410d_1
+  - pythia8=8.244=py27haf22ab1_1
+  - python=2.7.18=h15b4118_1
+  - python-dateutil=2.8.1=py_0
+  - python_abi=2.7=1_cp27mu
+  - pyzmq=19.0.0=py27h76efe43_1
+  - readline=8.1=h27cfd23_0
+  - root=6.22.0=py27hf09d227_2
+  - root-binaries=6.22.0=py27hf09d227_2
+  - root-dependencies=6.22.0=py27hf09d227_2
+  - root_base=6.22.0=py27h07c60d7_2
+  - scandir=1.10.0=py27hdf8410d_1
+  - send2trash=1.5.0=py_0
+  - setuptools=44.0.0=py27_0
+  - simplegeneric=0.8.1=py27_0
+  - singledispatch=3.6.1=pyh44b312d_0
+  - six=1.15.0=pyh9f0ad1d_0
+  - sqlite=3.35.3=h74cdb3f_0
+  - tbb=2020.3=hfd86e86_0
+  - tbb-devel=2020.3=hfd86e86_0
+  - terminado=0.8.3=py27h8c360ce_1
+  - testpath=0.4.4=py_0
+  - tk=8.6.10=hed695b0_1
+  - tornado=5.1.1=py27h14c3975_1000
+  - traitlets=4.3.3=py27h8c360ce_1
+  - vdt=0.4.3=hf484d3e_0
+  - wcwidth=0.2.5=pyh9f0ad1d_2
+  - webencodings=0.5.1=py_1
+  - wheel=0.36.2=pyhd3deb0d_0
+  - xorg-fixesproto=5.0=h14c3975_1002
+  - xorg-kbproto=1.0.7=h14c3975_1002
+  - xorg-libice=1.0.10=h516909a_0
+  - xorg-libsm=1.2.3=hd9c2040_1000
+  - xorg-libx11=1.6.12=h516909a_0
+  - xorg-libxau=1.0.9=h14c3975_0
+  - xorg-libxcursor=1.2.0=h516909a_0
+  - xorg-libxext=1.3.4=h516909a_0
+  - xorg-libxfixes=5.0.3=h516909a_1004
+  - xorg-libxft=2.3.3=h71203ad_0
+  - xorg-libxpm=3.5.13=h516909a_0
+  - xorg-libxrender=0.9.10=h516909a_1002
+  - xorg-libxt=1.1.5=h516909a_1003
+  - xorg-renderproto=0.11.1=h14c3975_1002
+  - xorg-xextproto=7.3.0=h14c3975_1002
+  - xorg-xproto=7.0.31=h14c3975_1007
+  - xrootd=4.12.3=py27h25260f6_0
+  - xxhash=0.7.4=h516909a_0
+  - xz=5.2.5=h516909a_1
+  - zeromq=4.3.2=he1b5a44_2
+  - zipp=1.0.0=py_0
+  - zlib=1.2.11=h516909a_1010
+  - zstd=1.4.8=hdf46e1d_0