diff --git a/flake.nix b/flake.nix index 8627287468..cefc35808d 100644 --- a/flake.nix +++ b/flake.nix @@ -21,18 +21,6 @@ }: let - toml = pkgs: ((import ./nix/toml11.nix) { inherit pkgs; }); - onedpl = pkgs: old: pkgs.onedpl; - # ((import ./nix/onedpl.nix) { - # inherit (pkgs) - # lib - # stdenv - # fetchFromGitHub - # fetchpatch - # cmake - # ; - # tbb = old.tbb_2021_11; - # }); exe-name = gui: if gui then "dissolve-gui" else "dissolve"; cmake-bool = x: if x then "ON" else "OFF"; version = "1.9.0"; @@ -52,7 +40,7 @@ jre pkg-config pugixml - (toml pkgs) + toml11 ]; gui_libs = system: pkgs: qt: [ pkgs.glib @@ -113,7 +101,7 @@ ++ pkgs.lib.optionals checks (check_libs pkgs) ++ pkgs.lib.optionals threading [ old.tbb_2021_11 - (onedpl pkgs old) + pkgs.onedpl ]; nativeBuildInputs = pkgs.lib.optionals gui [ pkgs.wrapGAppsHook3 ]; @@ -186,7 +174,7 @@ ++ (with pkgs; [ llvmPackages_20.clang-tools - (onedpl pkgs old) + onedpl ccache ccls diff --git a/nix/onedpl.nix b/nix/onedpl.nix deleted file mode 100644 index e34d7ee5d0..0000000000 --- a/nix/onedpl.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, tbb }: - -stdenv.mkDerivation rec { - pname = "oneDPL"; - version = "oneDPL-2022.0.0-release "; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "oneapi-src"; - repo = "oneDPL"; - rev = "240685db73e3169e66dbb625b4d5fa1ad06ec79b"; - sha256 = "5E/EUJjhi6VQfYo3qdDHiETnXNEymsLR3hMSH5Gfa0M="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ tbb ]; - - # patches = [ - # # Fix musl build from https://github.com/oneapi-src/oneTBB/pull/899 - # (fetchpatch { - # url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch"; - # hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU="; - # }) - - # # Fix/suppress warnings on gcc12.1 from https://github.com/oneapi-src/oneTBB/pull/866 - # (fetchpatch { - # url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/866.patch"; - # hash = "sha256-e44Yv84Hfl5xoxWWTnLJLSGeNA1RBbah4/L43gPLS+c="; - # }) - # ]; - - # Fix build with modern gcc - # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', - NIX_CFLAGS_COMPILE = - lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" ] ++ - # Workaround for gcc-12 ICE when using -O3 - # https://gcc.gnu.org/PR108854 - lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; - - # Disable failing test on musl - # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’? - postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' - substituteInPlace test/CMakeLists.txt \ - --replace 'conformance_resumable_tasks' "" - ''; - - meta = with lib; { - description = "Intel Thread Building Blocks C++ Library"; - homepage = "http://threadingbuildingblocks.org/"; - license = licenses.asl20; - longDescription = '' - Intel Threading Building Blocks offers a rich and complete approach to - expressing parallelism in a C++ program. It is a library that helps you - take advantage of multi-core processor performance without having to be a - threading expert. Intel TBB is not just a threads-replacement library. It - represents a higher-level, task-based parallelism that abstracts platform - details and threading mechanisms for scalability and performance. - ''; - platforms = platforms.unix; - }; -} diff --git a/nix/toml11.nix b/nix/toml11.nix deleted file mode 100644 index 2b9e259776..0000000000 --- a/nix/toml11.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs }: - -pkgs.stdenv.mkDerivation rec { - name = "toml11"; - version = "v4.4.0"; - cmake = true; - buildInputs = [ pkgs.cmake ]; - src = pkgs.fetchFromGitHub { - owner = "ToruNiina"; - repo = "toml11"; - rev = version; - sha256 = "sha256-sgWKYxNT22nw376ttGsTdg0AMzOwp8QH3E8mx0BZJTQ="; - fetchSubmodules = true; - }; - cmakeFlags = [ - "-DCMAKE_INSTALL_INCLUDEDIR=include/toml11" - ]; -} diff --git a/src/base/serialiser.h b/src/base/serialiser.h index bf981ec82c..02f338afb3 100644 --- a/src/base/serialiser.h +++ b/src/base/serialiser.h @@ -4,11 +4,7 @@ #pragma once #include "templates/orderedMap.h" -#include -#include -#include -#include -#include +#include #include struct wo_comment_config diff --git a/src/nodes/forcefield.cpp b/src/nodes/forcefield.cpp index 31b012ab15..10a51adda8 100644 --- a/src/nodes/forcefield.cpp +++ b/src/nodes/forcefield.cpp @@ -3,7 +3,6 @@ #include "nodes/forcefield.h" #include "data/ff/library.h" -#include ForcefieldNode::ForcefieldNode(Graph *parentGraph) : Node(parentGraph) { diff --git a/tests/algorithms/orderedMap.cpp b/tests/algorithms/orderedMap.cpp index 42b7b92bc3..66da73b579 100644 --- a/tests/algorithms/orderedMap.cpp +++ b/tests/algorithms/orderedMap.cpp @@ -4,7 +4,6 @@ #include "templates/orderedMap.h" #include "base/serialiser.h" #include -#include namespace UnitTest {