From e661630ec0a7b2a1cf0b5049612796b06f320476 Mon Sep 17 00:00:00 2001 From: Jackson Burns <33505528+JacksonBurns@users.noreply.github.com> Date: Sat, 15 Jun 2024 12:22:45 -0400 Subject: [PATCH 1/2] switch multiple `rmg` packages to their official versions --- environment.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index 64df68a1c2d..48a4da34a33 100644 --- a/environment.yml +++ b/environment.yml @@ -81,13 +81,13 @@ dependencies: - conda-forge::gprof2dot - conda-forge::numdifftools - conda-forge::quantities + - conda-forge::muq + - conda-forge::lpsolve55 + - conda-forge::ringdecomposerlib-python # packages we maintain - - rmg::lpsolve55 - - rmg::muq2 - rmg::pydas >=1.0.3 - rmg::pydqed >=1.0.3 - - rmg::pyrdl - rmg::pyrms - rmg::symmetry From c3c584d8b5c5baadc7e35ddbec542cc27b84c914 Mon Sep 17 00:00:00 2001 From: Jackson Burns Date: Sat, 15 Jun 2024 12:30:24 -0400 Subject: [PATCH 2/2] force make to use gcc and g++ compilers changed in Makefile to avoid clang issue on mac os, as clang is now installed with muq and may conflict during installation --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index c573fc3b472..a2f6b3fed24 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,9 @@ # ################################################################################ +CC=gcc +CXX=g++ + .PHONY : all minimal main solver check pycheck arkane clean install decython documentation test q2dtor all: pycheck main solver check