diff --git a/env/machine/nixos/acpp/env_built_acpp.sh b/env/machine/nixos/acpp/env_built_acpp.sh deleted file mode 100644 index 895b24b097..0000000000 --- a/env/machine/nixos/acpp/env_built_acpp.sh +++ /dev/null @@ -1,37 +0,0 @@ -export SHAMROCK_DIR=/home/tdavidcl/Documents/shamrock-dev/Shamrock -export BUILD_DIR=/home/tdavidcl/Documents/shamrock-dev/Shamrock/build - -export CMAKE_GENERATOR="Ninja" - -export MAKE_EXEC=ninja -export MAKE_OPT=() -export CMAKE_OPT=( -DSHAMROCK_USE_SHARED_LIB=On) -export SHAMROCK_BUILD_TYPE="Release" -export SHAMROCK_CXX_FLAGS=" --acpp-targets='omp'" - -# Exports will be provided by the new env script above this line -# will be exported : ACPP_GIT_DIR, ACPP_BUILD_DIR, ACPP_INSTALL_DIR - -function shamconfigure { - cmake \ - -S $SHAMROCK_DIR \ - -B $BUILD_DIR \ - -DSHAMROCK_ENABLE_BACKEND=SYCL \ - -DSYCL_IMPLEMENTATION=ACPPDirect \ - -DCMAKE_CXX_COMPILER="${ACPP_INSTALL_DIR}/bin/acpp" \ - -DCMAKE_CXX_FLAGS="${SHAMROCK_CXX_FLAGS}" \ - -DACPP_PATH="${ACPP_INSTALL_DIR}" \ - -DCMAKE_BUILD_TYPE="${SHAMROCK_BUILD_TYPE}" \ - -DBUILD_TEST=Yes \ - "${CMAKE_OPT[@]}" -} - -function shammake { - (cd $BUILD_DIR && $MAKE_EXEC "${MAKE_OPT[@]}" "${@}") -} - -export REF_FILES_PATH=$BUILD_DIR/reference-files - -function pull_reffiles { - git clone https://github.com/Shamrock-code/reference-files.git $REF_FILES_PATH -} diff --git a/env/machine/nixos/acpp/setup-env.py b/env/machine/nixos/acpp/setup-env.py deleted file mode 100644 index b9ba7bc2fc..0000000000 --- a/env/machine/nixos/acpp/setup-env.py +++ /dev/null @@ -1,74 +0,0 @@ -import argparse -import os -import utils.acpp -import utils.sysinfo -import utils.envscript -from utils.setuparg import * -from utils.oscmd import * - -NAME = "NixOS generic AdaptiveCpp" -PATH = "machine/nixos/acpp" - -def setup(arg : SetupArg): - argv = arg.argv - builddir = arg.builddir - shamrockdir = arg.shamrockdir - buildtype = arg.buildtype - pylib = arg.pylib - lib_mode = arg.lib_mode - - print("------------------------------------------") - print("Running env setup for : "+NAME) - print("------------------------------------------") - - parser = argparse.ArgumentParser(prog=PATH,description= NAME+' env for Shamrock') - - parser.add_argument("--backend", action='store', help="sycl backend to use") - parser.add_argument("--arch", action='store', help="arch to build") - parser.add_argument("--gen", action='store', help="generator to use (ninja or make)") - - args = parser.parse_args(argv) - - gen, gen_opt, cmake_gen, cmake_build_type = utils.sysinfo.select_generator(args, buildtype) - - ENV_SCRIPT_PATH = builddir+"/activate" - - ENV_SCRIPT_HEADER = "" - ENV_SCRIPT_HEADER += "export SHAMROCK_DIR="+shamrockdir+"\n" - ENV_SCRIPT_HEADER += "export BUILD_DIR="+builddir+"\n" - ENV_SCRIPT_HEADER += "\n" - ENV_SCRIPT_HEADER += "export CMAKE_GENERATOR=\""+cmake_gen+"\"\n" - ENV_SCRIPT_HEADER += "\n" - ENV_SCRIPT_HEADER += "export MAKE_EXEC="+gen+"\n" - ENV_SCRIPT_HEADER += "export MAKE_OPT=("+gen_opt+")\n" - - # Get current file path - cur_file = os.path.realpath(os.path.expanduser(__file__)) - - cmake_extra_args = "" - if pylib: - cmake_extra_args += " -DBUILD_PYLIB=True" - run_cmd("cp "+os.path.abspath(os.path.join(cur_file, "../"+"_pysetup.py")) +" "+ builddir+"/setup.py") - - ENV_SCRIPT_HEADER += "export CMAKE_OPT=("+cmake_extra_args+")\n" - ENV_SCRIPT_HEADER += "export SHAMROCK_BUILD_TYPE=\""+cmake_build_type+"\"\n" - - run_cmd("mkdir -p "+builddir) - - # Get current file path - cur_file = os.path.realpath(os.path.expanduser(__file__)) - source_file = "env_built_acpp.sh" - source_nix_file = "shell.nix" - source_path = os.path.abspath(os.path.join(cur_file, "../"+source_file)) - source_nix_path = os.path.abspath(os.path.join(cur_file, "../"+source_nix_file)) - - utils.envscript.write_env_file( - source_path = source_path, - header = ENV_SCRIPT_HEADER, - path_write = ENV_SCRIPT_PATH) - - INTEL_LLVM_CLONE_HELPER = builddir+"/shell.nix" - utils.envscript.write_env_file( - source_path = source_nix_path, - header = "", - path_write = INTEL_LLVM_CLONE_HELPER) diff --git a/env/machine/nixos/acpp/shell.nix b/env/machine/nixos/acpp/shell.nix deleted file mode 100644 index 973a5787ff..0000000000 --- a/env/machine/nixos/acpp/shell.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ pkgs ? import {} }: - -let - llvm18 = pkgs.llvmPackages_18; - gccForLibs = pkgs.stdenv.cc.cc; - - # Derivation to combine clang and clang-tools - AdaptiveCpp = pkgs.stdenv.mkDerivation rec { - - pname = "acpp"; - version = "24.06.0"; # Adjust the version as needed - - # Fetch the tarball from GitHub releases - src = fetchTarball { - url = "https://github.com/AdaptiveCpp/AdaptiveCpp/archive/refs/tags/v24.06.0.tar.gz"; - sha256 = "sha256:1d7ld2azk45sv7124zkrkj1nfkmq0dani5zlalyn8v5s7q6vdxjc"; - }; - - buildInputs = [ - llvm18.clang-tools - llvm18.clang - llvm18.llvm - llvm18.libclang - pkgs.boost186 - pkgs.cmake - pkgs.ninja - ]; - - configurePhase = '' - ls - cmake -S . -GNinja -DCMAKE_INSTALL_PREFIX=$out -DCLANG_INCLUDE_PATH=${llvm18.libclang.dev}/include - ''; - - buildPhase = "ninja"; - - installPhase = "ninja install"; - - }; - -in -pkgs.mkShell { - - buildInputs = [ - AdaptiveCpp - - llvm18.clang-tools - llvm18.clang - llvm18.llvm - llvm18.openmp - llvm18.libclang - - pkgs.boost186 - pkgs.cmake - pkgs.zsh - - pkgs.python312Packages.matplotlib - pkgs.python312Packages.numpy - pkgs.python312Packages.scipy - pkgs.python312Packages.ipython - - pkgs.mpi - - pkgs.pre-commit - ]; - - # Set environment variables directly - ACPP_INSTALL_DIR = "${AdaptiveCpp}"; - - ACPP_DEBUG_LEVEL = "0"; - - shellHook = '' - # Optional: Add custom message for debugging or confirmation - echo "Entering Shamrock dev shell shell with LLVM 18 + AdaptiveCpp" - echo "acpp install path : $ACPP_INSTALL_DIR" - ''; -}