From d4cb4afb8538aca1a95fa5b54426c9b9b2558d8b Mon Sep 17 00:00:00 2001
From: Francois Coppens <francois.coppens@uvsq.fr>
Date: Wed, 21 Jul 2021 16:32:13 +0200
Subject: [PATCH] - Cleaned up unnecessary symlinks - Switched Intel compiler
 back to icpx

---
 Makefile          |  2 +-
 libqmckl.a        |  1 -
 libqmckl.la       |  1 -
 libqmckl.so       |  1 -
 libqmckl.so.0     |  1 -
 libqmckl.so.0.0.0 |  1 -
 main.cpp          | 28 ----------------------------
 qmckl.h           |  1 -
 smvars.sh         |  6 +++---
 9 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 120000 libqmckl.a
 delete mode 120000 libqmckl.la
 delete mode 120000 libqmckl.so
 delete mode 120000 libqmckl.so.0
 delete mode 120000 libqmckl.so.0.0.0
 delete mode 100644 main.cpp
 delete mode 120000 qmckl.h

diff --git a/Makefile b/Makefile
index f4b999b..aa2d9b6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 ## Compilers, compiler flags & external libs
 ifeq ($(ENV),INTEL)
-	CXX = icpc
+	CXX = icpx
 	FC = ifort
 	ARCH = -march=native
 	OPT = -O3
diff --git a/libqmckl.a b/libqmckl.a
deleted file mode 120000
index 817f721..0000000
--- a/libqmckl.a
+++ /dev/null
@@ -1 +0,0 @@
-qmckl/build/lib/libqmckl.a
\ No newline at end of file
diff --git a/libqmckl.la b/libqmckl.la
deleted file mode 120000
index a0ff7a3..0000000
--- a/libqmckl.la
+++ /dev/null
@@ -1 +0,0 @@
-qmckl/build/lib/libqmckl.la
\ No newline at end of file
diff --git a/libqmckl.so b/libqmckl.so
deleted file mode 120000
index bf1bb5e..0000000
--- a/libqmckl.so
+++ /dev/null
@@ -1 +0,0 @@
-qmckl/build/lib/libqmckl.so
\ No newline at end of file
diff --git a/libqmckl.so.0 b/libqmckl.so.0
deleted file mode 120000
index 04ce1b0..0000000
--- a/libqmckl.so.0
+++ /dev/null
@@ -1 +0,0 @@
-qmckl/build/lib/libqmckl.so.0
\ No newline at end of file
diff --git a/libqmckl.so.0.0.0 b/libqmckl.so.0.0.0
deleted file mode 120000
index b0fee51..0000000
--- a/libqmckl.so.0.0.0
+++ /dev/null
@@ -1 +0,0 @@
-qmckl/build/lib/libqmckl.so.0.0.0
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
deleted file mode 100644
index 1cfc478..0000000
--- a/main.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "qmckl.h"
-#include "assert.h"
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <math.h>
-#ifndef THRESHOLD
-#define THRESHOLD 1e-3
-#endif
-
-int main() {
-  qmckl_context context;
-  context = qmckl_context_create();
-
-  qmckl_exit_code rc;
-
-const uint64_t Dim = 2;
-const uint64_t N_updates = 2;
-const uint64_t Updates_index[2] = {0, 0};
-const double Updates[4] = {0.0, 0.0, 0.0, 0.0};
-double Slater_inv[4] = {0.0, 0.0, 0.0, 0.0};
-
-rc = qmckl_sherman_morrison_c(context, Dim, N_updates, Updates, Updates_index, Slater_inv);
-assert(rc == QMCKL_SUCCESS);
-
-assert (qmckl_context_destroy(context) == QMCKL_SUCCESS);
-  return 0;
-}
diff --git a/qmckl.h b/qmckl.h
deleted file mode 120000
index be9fbea..0000000
--- a/qmckl.h
+++ /dev/null
@@ -1 +0,0 @@
-qmckl/build/include/qmckl.h
\ No newline at end of file
diff --git a/smvars.sh b/smvars.sh
index 05174bc..4f24e7b 100644
--- a/smvars.sh
+++ b/smvars.sh
@@ -27,9 +27,9 @@ export SMROOT
 case $ENV in
   intel)
 	echo "* SM build environment set to 'intel'"
-	export HDF5_CXX=icpc
-	export HDF5_CXXLINKER=icpc
-	export HDF5_CLINKER=icpc
+	export HDF5_CXX=icpx
+	export HDF5_CXXLINKER=icpx
+	export HDF5_CLINKER=icpx
 	export ENV=INTEL
     ;;
   llvm)