Fixed MSVC build.

Fixed GhostRider build.
Fixed typo.
2025-12-07 07:55:04 -05:00 · 2022-08-07 22:19:54 +07:00 · 2022-08-07 21:21:36 +07:00 · 2022-08-07 17:31:13 +07:00 · 2022-08-07 17:25:32 +07:00 · 2022-08-06 15:25:40 +07:00
731 changed files with 112076 additions and 91381 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 /build
+scripts/build
+scripts/deps
 /CMakeLists.txt.user
 /.idea
 /src/backend/opencl/cl/cn/cryptonight_gen.cl
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "src/base"]
+	path = src/base
+	url = https://github.com/xmrig/base.git
+	branch = master
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,456 @@
+# v6.18.0
+- [#3067](https://github.com/xmrig/xmrig/pull/3067) Monero v15 network upgrade support and more house keeping.
+  - Removed deprecated AstroBWTv1 and v2.
+  - Fixed debug GhostRider build.
+  - Monero v15 network upgrade support.
+  - Fixed ZMQ debug log.
+  - Improved daemon ZMQ mining stability.
+- [#3054](https://github.com/xmrig/xmrig/pull/3054) Fixes for 32-bit ARM.
+- [#3042](https://github.com/xmrig/xmrig/pull/3042) Fixed being unable to resume from `pause-on-battery`.
+- [#3031](https://github.com/xmrig/xmrig/pull/3031) Fixed `--cpu-priority` not working sometimes.
+- [#3020](https://github.com/xmrig/xmrig/pull/3020) Removed old AstroBWT algorithm.
+
+# v6.17.0
+- [#2954](https://github.com/xmrig/xmrig/pull/2954) **Dero HE fork support (`astrobwt/v2` algorithm).**
+  - [#2961](https://github.com/xmrig/xmrig/pull/2961) Dero HE (`astrobwt/v2`) CUDA config generator.
+  - [#2969](https://github.com/xmrig/xmrig/pull/2969) Dero HE (`astrobwt/v2`) OpenCL support.
+- Fixed displayed DMI memory information for empty slots.
+- [#2932](https://github.com/xmrig/xmrig/pull/2932) Fixed GhostRider with hwloc disabled.
+
+# v6.16.4
+- [#2904](https://github.com/xmrig/xmrig/pull/2904) Fixed unaligned memory accesses.
+- [#2908](https://github.com/xmrig/xmrig/pull/2908) Added MSVC/2022 to `version.h`.
+- [#2910](https://github.com/xmrig/xmrig/issues/2910) Fixed donation for GhostRider/RTM.
+
+# v6.16.3
+- [#2778](https://github.com/xmrig/xmrig/pull/2778) Fixed `READY threads X/X` display after algorithm switching.
+- [#2782](https://github.com/xmrig/xmrig/pull/2782) Updated GhostRider documentation.
+- [#2815](https://github.com/xmrig/xmrig/pull/2815) Fixed `cn-heavy` in 32-bit builds.
+- [#2827](https://github.com/xmrig/xmrig/pull/2827) GhostRider: set correct priority for helper threads.
+- [#2837](https://github.com/xmrig/xmrig/pull/2837) RandomX: don't restart mining threads when the seed changes.
+- [#2848](https://github.com/xmrig/xmrig/pull/2848) GhostRider: added support for `client.reconnect` method.
+- [#2856](https://github.com/xmrig/xmrig/pull/2856) Fix for short responses from some Raptoreum pools.
+- [#2873](https://github.com/xmrig/xmrig/pull/2873) Fixed GhostRider benchmark on single-core systems.
+- [#2882](https://github.com/xmrig/xmrig/pull/2882) Fixed ARMv7 compilation.
+- [#2893](https://github.com/xmrig/xmrig/pull/2893) KawPow OpenCL: use separate UV loop for building programs.
+
+# v6.16.2
+- [#2751](https://github.com/xmrig/xmrig/pull/2751) Fixed crash on CPUs supporting VAES and running GCC-compiled xmrig.
+- [#2761](https://github.com/xmrig/xmrig/pull/2761) Fixed broken auto-tuning in GCC Windows build.
+- [#2771](https://github.com/xmrig/xmrig/issues/2771) Fixed environment variables support for GhostRider and KawPow. 
+- [#2769](https://github.com/xmrig/xmrig/pull/2769) Performance fixes:
+  - Fixed several performance bottlenecks introduced in v6.16.1.
+  - Fixed overall GCC-compiled build performance, it's the same speed as MSVC build now.
+  - **Linux builds are up to 10% faster now compared to v6.16.0 GCC build.**
+  - **Windows builds are up to 5% faster now compared to v6.16.0 MSVC build.**
+
+# v6.16.1
+- [#2729](https://github.com/xmrig/xmrig/pull/2729) GhostRider fixes:
+  - Added average hashrate display.
+  - Fixed the number of threads shown at startup.
+  - Fixed `--threads` or `-t` command line option (but `--cpu-max-threads-hint` is recommended to use).
+- [#2738](https://github.com/xmrig/xmrig/pull/2738) GhostRider fixes:
+  - Fixed "difficulty is not a number" error when diff is high on some pools.
+  - Fixed GhostRider compilation when `WITH_KAWPOW=OFF`.
+- [#2740](https://github.com/xmrig/xmrig/pull/2740) Added VAES support for Cryptonight variants **+4% speedup on Zen3**.
+  - VAES instructions are available on Intel Ice Lake/AMD Zen3 and newer CPUs.
+  - +4% speedup on Ryzen 5 5600X.
+
+# v6.16.0
+- [#2712](https://github.com/xmrig/xmrig/pull/2712) **GhostRider algorithm (Raptoreum) support**: read the [RELEASE NOTES](src/crypto/ghostrider/README.md) for quick start guide and performance comparisons.
+- [#2682](https://github.com/xmrig/xmrig/pull/2682) Fixed: use cn-heavy optimization only for Vermeer CPUs.
+- [#2684](https://github.com/xmrig/xmrig/pull/2684) MSR mod: fix for error 183.
+
+# v6.15.3
+- [#2614](https://github.com/xmrig/xmrig/pull/2614) OpenCL fixes for non-AMD platforms.
+- [#2623](https://github.com/xmrig/xmrig/pull/2623) Fixed compiling without kawpow.
+- [#2636](https://github.com/xmrig/xmrig/pull/2636) [#2639](https://github.com/xmrig/xmrig/pull/2639) AstroBWT speedup (up to +35%).
+- [#2646](https://github.com/xmrig/xmrig/pull/2646) Fixed MSVC compilation error.
+
+# v6.15.2
+- [#2606](https://github.com/xmrig/xmrig/pull/2606) Fixed: AstroBWT auto-config ignored `max-threads-hint`.
+- Fixed possible crash on Windows (regression in v6.15.1).
+
+# v6.15.1
+- [#2586](https://github.com/xmrig/xmrig/pull/2586) Fixed Windows 7 compatibility.
+- [#2594](https://github.com/xmrig/xmrig/pull/2594) Added Windows taskbar icon colors.
+
+# v6.15.0
+- [#2548](https://github.com/xmrig/xmrig/pull/2548) Added automatic coin detection for daemon mining.
+- [#2563](https://github.com/xmrig/xmrig/pull/2563) Added new algorithm RandomX Graft (`rx/graft`).
+- [#2565](https://github.com/xmrig/xmrig/pull/2565) AstroBWT: added AVX2 Salsa20 implementation.
+- Added support for new CUDA plugin API (previous API still supported).
+
+# v6.14.1
+- [#2532](https://github.com/xmrig/xmrig/pull/2532) Refactoring: stable (persistent) algorithms IDs.
+- [#2537](https://github.com/xmrig/xmrig/pull/2537) Fixed Termux build.
+
+# v6.14.0
+- [#2484](https://github.com/xmrig/xmrig/pull/2484) Added ZeroMQ support for solo mining.
+- [#2476](https://github.com/xmrig/xmrig/issues/2476) Fixed crash in DMI memory reader.
+- [#2492](https://github.com/xmrig/xmrig/issues/2492) Added missing `--huge-pages-jit` command line option.
+- [#2512](https://github.com/xmrig/xmrig/pull/2512) Added show the number of transactions in pool job.
+
+# v6.13.1
+- [#2468](https://github.com/xmrig/xmrig/pull/2468) Fixed regression in previous version: don't send miner signature during regular mining.
+
+# v6.13.0
+- [#2445](https://github.com/xmrig/xmrig/pull/2445) Added support for solo mining with miner signatures for the upcoming Wownero fork.
+
+# v6.12.2
+- [#2280](https://github.com/xmrig/xmrig/issues/2280) GPU backends are now disabled in benchmark mode.
+- [#2322](https://github.com/xmrig/xmrig/pull/2322) Improved MSR compatibility with recent Linux kernels and updated `randomx_boost.sh`.
+- [#2340](https://github.com/xmrig/xmrig/pull/2340) Fixed AES detection on FreeBSD on ARM.
+- [#2341](https://github.com/xmrig/xmrig/pull/2341) `sse2neon` updated to the latest version.
+- [#2351](https://github.com/xmrig/xmrig/issues/2351) Fixed help output for `--cpu-priority` and `--cpu-affinity` option.
+- [#2375](https://github.com/xmrig/xmrig/pull/2375) Fixed macOS CUDA backend default loader name.
+- [#2378](https://github.com/xmrig/xmrig/pull/2378) Fixed broken light mode mining on x86.
+- [#2379](https://github.com/xmrig/xmrig/pull/2379) Fixed CL code for KawPow where it assumes everything is AMD.
+- [#2386](https://github.com/xmrig/xmrig/pull/2386) RandomX: enabled `IMUL_RCP` optimization for light mode mining.
+- [#2393](https://github.com/xmrig/xmrig/pull/2393) RandomX: added BMI2 version for scratchpad prefetch.
+- [#2395](https://github.com/xmrig/xmrig/pull/2395) RandomX: rewrote dataset read code.
+- [#2398](https://github.com/xmrig/xmrig/pull/2398) RandomX: optimized ARMv8 dataset read.
+- Added `argon2/ninja` alias for `argon2/wrkz` algorithm.
+
+# v6.12.1
+- [#2296](https://github.com/xmrig/xmrig/pull/2296) Fixed Zen3 assembly code for `cn/upx2` algorithm.
+
+# v6.12.0
+- [#2276](https://github.com/xmrig/xmrig/pull/2276) Added support for Uplexa (`cn/upx2` algorithm).
+- [#2261](https://github.com/xmrig/xmrig/pull/2261) Show total hashrate if compiled without OpenCL.
+- [#2289](https://github.com/xmrig/xmrig/pull/2289) RandomX: optimized `IMUL_RCP` instruction.
+- Added support for `--user` command line option for online benchmark.
+
+# v6.11.2
+- [#2207](https://github.com/xmrig/xmrig/issues/2207) Fixed regression in HTTP parser and llhttp updated to v5.1.0.
+
+# v6.11.1
+- [#2239](https://github.com/xmrig/xmrig/pull/2239) Fixed broken `coin` setting functionality.
+
+# v6.11.0
+- [#2196](https://github.com/xmrig/xmrig/pull/2196) Improved DNS subsystem and added new DNS specific options.
+- [#2172](https://github.com/xmrig/xmrig/pull/2172) Fixed build on Alpine 3.13.
+- [#2177](https://github.com/xmrig/xmrig/pull/2177) Fixed ARM specific compilation error with GCC 10.2.
+- [#2214](https://github.com/xmrig/xmrig/pull/2214) [#2216](https://github.com/xmrig/xmrig/pull/2216) [#2235](https://github.com/xmrig/xmrig/pull/2235) Optimized `cn-heavy` algorithm.
+- [#2217](https://github.com/xmrig/xmrig/pull/2217) Fixed mining job creation sequence.
+- [#2225](https://github.com/xmrig/xmrig/pull/2225) Fixed build without OpenCL support on some systems.
+- [#2229](https://github.com/xmrig/xmrig/pull/2229) Don't use RandomX JIT if `WITH_ASM=OFF`.
+- [#2228](https://github.com/xmrig/xmrig/pull/2228) Removed useless code for cryptonight algorithms.
+- [#2234](https://github.com/xmrig/xmrig/pull/2234) Fixed build error on gcc 4.8.
+
+# v6.10.0
+- [#2122](https://github.com/xmrig/xmrig/pull/2122) Fixed pause logic when both pause on battery and user activity are enabled.
+- [#2123](https://github.com/xmrig/xmrig/issues/2123) Fixed compatibility with gcc 4.8.
+- [#2147](https://github.com/xmrig/xmrig/pull/2147) Fixed many `new job` messages when solo mining.
+- [#2150](https://github.com/xmrig/xmrig/pull/2150) Updated `sse2neon.h` to the latest master, fixes build on ARMv7.
+- [#2157](https://github.com/xmrig/xmrig/pull/2157) Fixed crash in `cn-heavy` on Zen3 with manual thread count.
+- Fixed possible out of order write to log file.
+- [http-parser](https://github.com/nodejs/http-parser) replaced to [llhttp](https://github.com/nodejs/llhttp).
+- For official builds: libuv, hwloc and OpenSSL updated to latest versions.
+
+# v6.9.0
+- [#2104](https://github.com/xmrig/xmrig/pull/2104) Added [pause-on-active](https://xmrig.com/docs/miner/config/misc#pause-on-active) config option and `--pause-on-active=N` command line option.
+- [#2112](https://github.com/xmrig/xmrig/pull/2112) Added support for [Tari merge mining](https://github.com/tari-project/tari/blob/development/README.md#tari-merge-mining).
+- [#2117](https://github.com/xmrig/xmrig/pull/2117) Fixed crash when GPU mining `cn-heavy` on Zen3 system.
+
+# v6.8.2
+- [#2080](https://github.com/xmrig/xmrig/pull/2080) Fixed compile error in Termux.
+- [#2089](https://github.com/xmrig/xmrig/pull/2089) Optimized CryptoNight-Heavy for Zen3, 7-8% speedup.
+
+# v6.8.1
+- [#2064](https://github.com/xmrig/xmrig/pull/2064) Added documentation for config.json CPU options.
+- [#2066](https://github.com/xmrig/xmrig/issues/2066) Fixed AMD GPUs health data readings on Linux.
+- [#2067](https://github.com/xmrig/xmrig/pull/2067) Fixed compilation error when RandomX and Argon2 are disabled.
+- [#2076](https://github.com/xmrig/xmrig/pull/2076) Added support for flexible huge page sizes on Linux.
+- [#2077](https://github.com/xmrig/xmrig/pull/2077) Fixed `illegal instruction` crash on ARM.
+
+# v6.8.0
+- [#2052](https://github.com/xmrig/xmrig/pull/2052) Added DMI/SMBIOS reader.
+  - Added information about memory modules on the miner startup and for online benchmark.
+  - Added new HTTP API endpoint: `GET /2/dmi`.
+  - Added new command line option `--no-dmi` or config option `"dmi"`.
+  - Added new CMake option `-DWITH_DMI=OFF`.
+- [#2057](https://github.com/xmrig/xmrig/pull/2057) Improved MSR subsystem code quality.
+- [#2058](https://github.com/xmrig/xmrig/pull/2058) RandomX JIT x86: removed unnecessary instructions.
+
+# v6.7.2
+- [#2039](https://github.com/xmrig/xmrig/pull/2039) Fixed solo mining.
+
+# v6.7.1
+- [#1995](https://github.com/xmrig/xmrig/issues/1995) Fixed log initialization.
+- [#1998](https://github.com/xmrig/xmrig/pull/1998) Added hashrate in the benchmark finished message.
+- [#2009](https://github.com/xmrig/xmrig/pull/2009) AstroBWT OpenCL fixes.
+- [#2028](https://github.com/xmrig/xmrig/pull/2028) RandomX x86 JIT: removed redundant `CFROUND`.
+
+# v6.7.0
+- **[#1991](https://github.com/xmrig/xmrig/issues/1991) Added Apple M1 processor support.**
+- **[#1986](https://github.com/xmrig/xmrig/pull/1986) Up to 20-30% faster RandomX dataset initialization with AVX2 on some CPUs.**
+- [#1964](https://github.com/xmrig/xmrig/pull/1964) Cleanup and refactoring.
+- [#1966](https://github.com/xmrig/xmrig/pull/1966) Removed libcpuid support.
+- [#1968](https://github.com/xmrig/xmrig/pull/1968) Added virtual machine detection.
+- [#1969](https://github.com/xmrig/xmrig/pull/1969) [#1970](https://github.com/xmrig/xmrig/pull/1970) Fixed errors found by static analysis.
+- [#1977](https://github.com/xmrig/xmrig/pull/1977) Fixed: secure JIT and huge pages are incompatible on Windows.
+- [#1979](https://github.com/xmrig/xmrig/pull/1979) Term `x64` replaced to `64-bit`.
+- [#1980](https://github.com/xmrig/xmrig/pull/1980) Fixed build on gcc 11.
+- [#1989](https://github.com/xmrig/xmrig/pull/1989) Fixed broken Dero solo mining.
+
+# v6.6.2
+- [#1958](https://github.com/xmrig/xmrig/pull/1958) Added example mining scripts to help new miners.
+- [#1959](https://github.com/xmrig/xmrig/pull/1959) Optimized JIT compiler.
+- [#1960](https://github.com/xmrig/xmrig/pull/1960) Fixed RandomX init when switching to other algo and back.
+
+# v6.6.1
+- Fixed, benchmark validation on NUMA hardware produced incorrect results in some conditions.
+
+# v6.6.0
+- Online benchmark protocol upgraded to v2, validation not compatible with previous versions.
+  - Single thread benchmark now is cheat-resistant, not possible speedup it with multiple threads.
+  - RandomX dataset is now always initialized with static seed, to prevent time cheat by report slow dataset initialization.
+  - Zero delay online submission, to make time validation much more precise and strict.
+  - DNS cache for online benchmark to prevent unexpected delays.
+
+# v6.5.3
+- [#1946](https://github.com/xmrig/xmrig/pull/1946) Fixed MSR mod names in JSON API (v6.5.2 affected).
+
+# v6.5.2
+- [#1935](https://github.com/xmrig/xmrig/pull/1935) Separate MSR mod for Zen/Zen2 and Zen3.
+- [#1937](https://github.com/xmrig/xmrig/issues/1937) Print path to existing WinRing0 service without verbose option.
+- [#1939](https://github.com/xmrig/xmrig/pull/1939) Fixed build with gcc 4.8.
+- [#1941](https://github.com/xmrig/xmrig/pull/1941) Added CPUID info to JSON report.
+- [#1941](https://github.com/xmrig/xmrig/pull/1942) Fixed alignment modification in memory pool.
+- [#1944](https://github.com/xmrig/xmrig/pull/1944) Updated `randomx_boost.sh` with new MSR mod.
+- Added `250K` and `500K` offline benchmarks.
+
+# v6.5.1
+- [#1932](https://github.com/xmrig/xmrig/pull/1932) New MSR mod for Ryzen, up to +3.5% on Zen2 and +1-2% on Zen3.
+- [#1918](https://github.com/xmrig/xmrig/issues/1918) Fixed 1GB huge pages support on ARMv8.
+- [#1926](https://github.com/xmrig/xmrig/pull/1926) Fixed compilation on ARMv8 with GCC 9.3.0.
+- [#1929](https://github.com/xmrig/xmrig/issues/1929) Fixed build without HTTP.
+
+# v6.5.0
+- **Added [online benchmark](https://xmrig.com/benchmark) mode for sharing results.**
+  - Added new command line options: `--submit`, `	--verify=ID`, `	--seed=SEED`, `--hash=HASH`.
+- [#1912](https://github.com/xmrig/xmrig/pull/1912) Fixed MSR kernel module warning with new Linux kernels.
+- [#1925](https://github.com/xmrig/xmrig/pull/1925) Add checking for config files in user home directory.
+- Added vendor to ARM CPUs name and added `"arch"` field to API.
+- Removed legacy CUDA plugin API.
+
+# v6.4.0
+- [#1862](https://github.com/xmrig/xmrig/pull/1862) **RandomX: removed `rx/loki` algorithm.**
+- [#1890](https://github.com/xmrig/xmrig/pull/1890) **Added `argon2/chukwav2` algorithm.**
+- [#1895](https://github.com/xmrig/xmrig/pull/1895) [#1897](https://github.com/xmrig/xmrig/pull/1897) **Added [benchmark and stress test](https://github.com/xmrig/xmrig/blob/dev/doc/BENCHMARK.md).**
+- [#1864](https://github.com/xmrig/xmrig/pull/1864) RandomX: improved software AES performance.
+- [#1870](https://github.com/xmrig/xmrig/pull/1870) RandomX: fixed unexpected resume due to disconnect during dataset init.
+- [#1872](https://github.com/xmrig/xmrig/pull/1872) RandomX: fixed `randomx_create_vm` call.
+- [#1875](https://github.com/xmrig/xmrig/pull/1875) RandomX: fixed crash on x86.
+- [#1876](https://github.com/xmrig/xmrig/pull/1876) RandomX: added `huge-pages-jit` config parameter.
+- [#1881](https://github.com/xmrig/xmrig/pull/1881) Fixed possible race condition in hashrate counting code.
+- [#1882](https://github.com/xmrig/xmrig/pull/1882) [#1886](https://github.com/xmrig/xmrig/pull/1886) [#1887](https://github.com/xmrig/xmrig/pull/1887) [#1893](https://github.com/xmrig/xmrig/pull/1893) General code improvements.
+- [#1885](https://github.com/xmrig/xmrig/pull/1885) Added more precise hashrate calculation.
+- [#1889](https://github.com/xmrig/xmrig/pull/1889) Fixed libuv performance issue on Linux.
+
+# v6.3.5
+- [#1845](https://github.com/xmrig/xmrig/pull/1845) [#1861](https://github.com/xmrig/xmrig/pull/1861) Fixed ARM build and added CMake option `WITH_SSE4_1`.
+- [#1846](https://github.com/xmrig/xmrig/pull/1846) KawPow: fixed OpenCL memory leak.
+- [#1849](https://github.com/xmrig/xmrig/pull/1849) [#1859](https://github.com/xmrig/xmrig/pull/1859) RandomX: optimized soft AES code.
+- [#1850](https://github.com/xmrig/xmrig/pull/1850) [#1852](https://github.com/xmrig/xmrig/pull/1852) General code improvements.
+- [#1853](https://github.com/xmrig/xmrig/issues/1853) [#1856](https://github.com/xmrig/xmrig/pull/1856) [#1857](https://github.com/xmrig/xmrig/pull/1857) Fixed crash on old CPUs.
+
+# v6.3.4
+- [#1823](https://github.com/xmrig/xmrig/pull/1823) RandomX: added new option `scratchpad_prefetch_mode`.
+- [#1827](https://github.com/xmrig/xmrig/pull/1827) [#1831](https://github.com/xmrig/xmrig/pull/1831) Improved nonce iteration performance.
+- [#1828](https://github.com/xmrig/xmrig/pull/1828) RandomX: added SSE4.1-optimized Blake2b.
+- [#1830](https://github.com/xmrig/xmrig/pull/1830) RandomX: added performance profiler (for developers).
+- [#1835](https://github.com/xmrig/xmrig/pull/1835) RandomX: returned old soft AES implementation and added auto-select between the two.
+- [#1840](https://github.com/xmrig/xmrig/pull/1840) RandomX: moved more stuff to compile time, small x86 JIT compiler speedup.
+- [#1841](https://github.com/xmrig/xmrig/pull/1841) Fixed Cryptonight OpenCL for AMD 20.7.2 drivers.
+- [#1842](https://github.com/xmrig/xmrig/pull/1842) RandomX: AES improvements, a bit faster hardware AES code when compiled with MSVC.
+- [#1843](https://github.com/xmrig/xmrig/pull/1843) RandomX: improved performance of GCC compiled binaries.
+
+# v6.3.3
+- [#1817](https://github.com/xmrig/xmrig/pull/1817) Fixed self-select login sequence.
+- Added brand new [build from source](https://xmrig.com/docs/miner/build) documentation.
+- New binary downloads for macOS (`macos-x64`), FreeBSD (`freebsd-static-x64`), Linux (`linux-static-x64`), Ubuntu 18.04 (`bionic-x64`), Ubuntu 20.04 (`focal-x64`).
+- Generic Linux download `xenial-x64` renamed to `linux-x64`.
+- Builds without SSL/TLS support are no longer provided.
+- Improved CUDA loader error reporting and fixed plugin load on Linux.
+- Fixed build warnings with Clang compiler.
+- Fixed colors on macOS.
+
+# v6.3.2
+- [#1794](https://github.com/xmrig/xmrig/pull/1794) More robust 1 GB pages handling.
+  - Don't allocate 1 GB per thread if 1 GB is the default huge page size.
+  - Try to allocate scratchpad from dataset's 1 GB huge pages, if normal huge pages are not available.
+  - Correctly initialize RandomX cache if 1 GB pages fail to allocate on a first NUMA node.
+- [#1806](https://github.com/xmrig/xmrig/pull/1806) Fixed macOS battery detection.
+- [#1809](https://github.com/xmrig/xmrig/issues/1809) Improved auto configuration on ARM CPUs.
+  - Added retrieving ARM CPU names, based on lscpu code and database.
+
+# v6.3.1
+- [#1786](https://github.com/xmrig/xmrig/pull/1786) Added `pause-on-battery` option, supported on Windows and Linux.
+- Added command line options `--randomx-cache-qos` and `--argon2-impl`.
+
+# v6.3.0
+- [#1771](https://github.com/xmrig/xmrig/pull/1771) Adopted new SSE2NEON and reduced ARM-specific changes.
+- [#1774](https://github.com/xmrig/xmrig/pull/1774) RandomX: Added new option `cache_qos` in `randomx` object for cache QoS support.
+- [#1777](https://github.com/xmrig/xmrig/pull/1777) Added support for upcoming Haven offshore fork.
+  - [#1780](https://github.com/xmrig/xmrig/pull/1780) CryptoNight OpenCL: fix for long input data.
+
+# v6.2.3
+- [#1745](https://github.com/xmrig/xmrig/pull/1745) AstroBWT: fixed OpenCL compilation on some systems.
+- [#1749](https://github.com/xmrig/xmrig/pull/1749) KawPow: optimized CPU share verification.
+- [#1752](https://github.com/xmrig/xmrig/pull/1752) RandomX: added error message when MSR mod fails.
+- [#1754](https://github.com/xmrig/xmrig/issues/1754) Fixed GPU health readings for pre Vega GPUs on Linux.
+- [#1756](https://github.com/xmrig/xmrig/issues/1756) Added results and connection reports.
+- [#1759](https://github.com/xmrig/xmrig/pull/1759) KawPow: fixed DAG initialization on slower AMD GPUs.
+- [#1763](https://github.com/xmrig/xmrig/pull/1763) KawPow: fixed rare duplicate share errors.
+- [#1766](https://github.com/xmrig/xmrig/pull/1766) RandomX: small speedup on Ryzen CPUs.
+
+# v6.2.2
+- [#1742](https://github.com/xmrig/xmrig/issues/1742) Fixed crash when use HTTP API.
+
+# v6.2.1
+- [#1726](https://github.com/xmrig/xmrig/issues/1726) Fixed detection of AVX2/AVX512.
+- [#1728](https://github.com/xmrig/xmrig/issues/1728) Fixed, 32 bit Windows builds was crash on start.
+- [#1729](https://github.com/xmrig/xmrig/pull/1729) Fixed KawPow crash on old CPUs.
+- [#1730](https://github.com/xmrig/xmrig/pull/1730) Improved displaying information for compute errors on GPUs.
+- [#1732](https://github.com/xmrig/xmrig/pull/1732) Fixed NiceHash disconnects for KawPow.
+- Fixed AMD GPU health (temperatures/power/clocks/fans) readings on Linux.
+
+# v6.2.0-beta
+- [#1717](https://github.com/xmrig/xmrig/pull/1717) Added new algorithm `cn/ccx` for Conceal.
+- [#1718](https://github.com/xmrig/xmrig/pull/1718) Fixed, linker on Linux was marking entire executable as having an executable stack.
+- [#1720](https://github.com/xmrig/xmrig/pull/1720) Fixed broken CryptoNight algorithms family with gcc 10.1.
+
+# v6.0.1-beta
+- [#1708](https://github.com/xmrig/xmrig/issues/1708) Added `title` option.
+- [#1711](https://github.com/xmrig/xmrig/pull/1711) [cuda] Print errors from KawPow DAG initialization.
+- [#1713](https://github.com/xmrig/xmrig/pull/1713) [cuda] Reduced memory usage for KawPow, minimum CUDA plugin version now is 6.1.0.
+
+# v6.0.0-beta
+- [#1694](https://github.com/xmrig/xmrig/pull/1694) Added support for KawPow algorithm (Ravencoin) on AMD/NVIDIA.
+- Removed previously deprecated `cn/gpu` algorithm.
+- Default donation level reduced to 1% but you still can increase it if you like.
+
+# v5.11.3
+- [#1718](https://github.com/xmrig/xmrig/pull/1718) Fixed, linker on Linux was marking entire executable as having an executable stack.
+- [#1720](https://github.com/xmrig/xmrig/pull/1720) Fixed broken CryptoNight algorithms family with gcc 10.1.
+
+# v5.11.2
+- [#1664](https://github.com/xmrig/xmrig/pull/1664) Improved JSON config error reporting.
+- [#1668](https://github.com/xmrig/xmrig/pull/1668) Optimized RandomX dataset initialization.
+- [#1675](https://github.com/xmrig/xmrig/pull/1675) Fixed cross-compiling on Linux.
+- Fixed memory leak in HTTP client.
+- Build [dependencies](https://github.com/xmrig/xmrig-deps/releases/tag/v4.1) updated to recent versions.
+- Compiler for Windows gcc builds updated to v10.1.
+
+# v5.11.1
+- [#1652](https://github.com/xmrig/xmrig/pull/1652) Up to 1% RandomX perfomance improvement on recent AMD CPUs.
+- [#1306](https://github.com/xmrig/xmrig/issues/1306) Fixed possible double connection to a pool.
+- [#1654](https://github.com/xmrig/xmrig/issues/1654) Fixed build with LibreSSL.
+
+# v5.11.0
+- **[#1632](https://github.com/xmrig/xmrig/pull/1632) Added AstroBWT CUDA support ([CUDA plugin](https://github.com/xmrig/xmrig-cuda) v3.0.0 or newer required).**
+- [#1605](https://github.com/xmrig/xmrig/pull/1605) Fixed AstroBWT OpenCL for NVIDIA GPUs.
+- [#1635](https://github.com/xmrig/xmrig/pull/1635) Added pooled memory allocation of RandomX VMs (+0.5% speedup on Zen2).
+- [#1641](https://github.com/xmrig/xmrig/pull/1641) RandomX JIT refactoring, smaller memory footprint and a bit faster overall.
+- [#1643](https://github.com/xmrig/xmrig/issues/1643) Fixed build on CentOS 7.
+
+# v5.10.0
+- [#1602](https://github.com/xmrig/xmrig/pull/1602) Added AMD GPUs support for AstroBWT algorithm.
+- [#1590](https://github.com/xmrig/xmrig/pull/1590) MSR mod automatically deactivated after switching from RandomX algorithms.
+- [#1592](https://github.com/xmrig/xmrig/pull/1592) Added AVX2 optimized code for AstroBWT algorithm.
+  - Added new config option `astrobwt-avx2` in `cpu` object and command line option `--astrobwt-avx2`.
+- [#1596](https://github.com/xmrig/xmrig/issues/1596) Major TLS (Transport Layer Security) subsystem update.
+  - Added new TLS options, please check [xmrig-proxy documentation](https://xmrig.com/docs/proxy/tls) for details.
+- `cn/gpu` algorithm now disabled by default and will be removed in next major (v6.x.x) release, no ETA for it right now.
+- Added command line option `--data-dir`.
+
+# v5.9.0
+- [#1578](https://github.com/xmrig/xmrig/pull/1578) Added new RandomKEVA algorithm for upcoming Kevacoin fork, as `"algo": "rx/keva"` or `"coin": "keva"`.
+- [#1584](https://github.com/xmrig/xmrig/pull/1584) Fixed invalid AstroBWT hashes after algorithm switching.
+- [#1585](https://github.com/xmrig/xmrig/issues/1585) Fixed build without HTTP support.
+- Added command line option `--astrobwt-max-size`.
+
+# v5.8.2
+- [#1580](https://github.com/xmrig/xmrig/pull/1580) AstroBWT algorithm 20-50% speedup.
+  - Added new option `astrobwt-max-size`.
+- [#1581](https://github.com/xmrig/xmrig/issues/1581) Fixed macOS build.
+
+# v5.8.1
+- [#1575](https://github.com/xmrig/xmrig/pull/1575) Fixed new block detection for DERO solo mining.
+
+# v5.8.0
+- [#1573](https://github.com/xmrig/xmrig/pull/1573) Added new AstroBWT algorithm for upcoming DERO fork, as `"algo": "astrobwt"` or `"coin": "dero"`.
+
+# v5.7.0
+- **Added SOCKS5 proxies support for Tor https://xmrig.com/docs/miner/tor.**
+- [#377](https://github.com/xmrig/xmrig-proxy/issues/377) Fixed duplicate jobs in daemon (solo) mining client.
+- [#1560](https://github.com/xmrig/xmrig/pull/1560) RandomX 0.3-0.4% speedup depending on CPU.
+- Fixed possible crashes in HTTP client.
+
+# v5.6.0
+- [#1536](https://github.com/xmrig/xmrig/pull/1536) Added workaround for new AMD GPU drivers.
+- [#1546](https://github.com/xmrig/xmrig/pull/1546) Fixed generic OpenCL code for AMD Navi GPUs.
+- [#1551](https://github.com/xmrig/xmrig/pull/1551) Added RandomX JIT for AMD Navi  GPUs.
+- Added health information for AMD GPUs (clocks/power/fan/temperature) via ADL (Windows) and sysfs (Linux).
+- Fixed possible nicehash nonce overflow in some conditions.
+- Fixed wrong OpenCL platform on macOS, option `platform` now ignored on this OS.
+
+# v5.5.3
+- [#1529](https://github.com/xmrig/xmrig/pull/1529) Fixed crash on Bulldozer CPUs.
+
+# v5.5.2
+- [#1500](https://github.com/xmrig/xmrig/pull/1500) Removed unnecessary code from RandomX JIT compiler.
+- [#1502](https://github.com/xmrig/xmrig/pull/1502) Optimizations for AMD Bulldozer.
+- [#1508](https://github.com/xmrig/xmrig/pull/1508) Added support for BMI2 instructions.
+- [#1510](https://github.com/xmrig/xmrig/pull/1510) Optimized `CFROUND` instruction for RandomX.
+- [#1520](https://github.com/xmrig/xmrig/pull/1520) Fixed thread affinity.
+
+# v5.5.1
+- [#1469](https://github.com/xmrig/xmrig/issues/1469) Fixed build with gcc 4.8.
+- [#1473](https://github.com/xmrig/xmrig/pull/1473) Added RandomX auto-config for mobile Ryzen APUs.
+- [#1477](https://github.com/xmrig/xmrig/pull/1477) Fixed build with Clang.
+- [#1489](https://github.com/xmrig/xmrig/pull/1489) RandomX JIT compiler tweaks.
+- [#1493](https://github.com/xmrig/xmrig/pull/1493) Default value for Intel MSR preset changed to `15`.
+- Fixed unwanted resume after RandomX dataset change.
+
+# v5.5.0
+- [#179](https://github.com/xmrig/xmrig/issues/179) Added support for [environment variables](https://xmrig.com/docs/miner/environment-variables) in config file.
+- [#1445](https://github.com/xmrig/xmrig/pull/1445) Removed `rx/v` algorithm.
+- [#1453](https://github.com/xmrig/xmrig/issues/1453) Fixed crash on 32bit systems.
+- [#1459](https://github.com/xmrig/xmrig/issues/1459) Fixed crash on very low memory systems.
+- [#1465](https://github.com/xmrig/xmrig/pull/1465) Added fix for 1st-gen Ryzen crashes.
+- [#1466](https://github.com/xmrig/xmrig/pull/1466) Added `cn-pico/tlo` algorithm.
+- Added `--randomx-no-rdmsr` command line option.
+- Added console title for Windows with miner name and version.
+- On Windows `priority` option now also change base priority.
+
+# v5.4.0
+- [#1434](https://github.com/xmrig/xmrig/pull/1434) Added RandomSFX (`rx/sfx`) algorithm for Safex Cash.
+- [#1445](https://github.com/xmrig/xmrig/pull/1445) Added RandomV (`rx/v`) algorithm for *new* MoneroV.
+- [#1419](https://github.com/xmrig/xmrig/issues/1419) Added reverting MSR changes on miner exit, use `"rdmsr": false,` in `"randomx"` object to disable this feature.
+- [#1423](https://github.com/xmrig/xmrig/issues/1423) Fixed conflicts with exists WinRing0 driver service.
+- [#1425](https://github.com/xmrig/xmrig/issues/1425) Fixed crash on first generation Zen CPUs (MSR mod accidentally enable Opcache), additionally now you can disable Opcache and enable MSR mod via config `"wrmsr": ["0xc0011020:0x0", "0xc0011021:0x60", "0xc0011022:0x510000", "0xc001102b:0x1808cc16"],`.
+- Added advanced usage for `wrmsr` option, for example: `"wrmsr": ["0x1a4:0x6"],` (Intel) and `"wrmsr": ["0xc0011020:0x0", "0xc0011021:0x40:0xffffffffffffffdf", "0xc0011022:0x510000", "0xc001102b:0x1808cc16"],` (Ryzen).
+- Added new config option `"verbose"` and command line option `--verbose`.
+
+# v5.3.0
+- [#1414](https://github.com/xmrig/xmrig/pull/1414) Added native MSR support for Windows, by using signed **WinRing0 driver** (© 2007-2009 OpenLibSys.org).
+- Added new [MSR documentation](https://xmrig.com/docs/miner/randomx-optimization-guide/msr).
+- [#1418](https://github.com/xmrig/xmrig/pull/1418) Increased stratum send buffer size.
+
+# v5.2.1
+- [#1408](https://github.com/xmrig/xmrig/pull/1408) Added RandomX boost script for Linux (if you don't like run miner with root privileges).
+- Added support for [AMD Ryzen MSR registers](https://www.reddit.com/r/MoneroMining/comments/e962fu/9526_hs_on_ryzen_7_3700x_xmrig_520_1gb_pages_msr/) (Linux only).
+- Fixed command line option `--randomx-wrmsr` option without parameters.
+
 # v5.2.0
 - **[#1388](https://github.com/xmrig/xmrig/pull/1388) Added [1GB huge pages support](https://xmrig.com/docs/miner/hugepages#onegb-huge-pages) for Linux.**
  - Added new option `1gb-pages` in `randomx` object with command line equivalent `--randomx-1gb-pages`.
  - Added automatic huge pages configuration on Linux if use the miner with root privileges.
 - **Added [automatic Intel prefetchers configuration](https://xmrig.com/docs/miner/randomx-optimization-guide#intel-specific-optimizations) on Linux.**
-   - Added new option `wrmsr` in `randomx` object with command line equivalent `--randomx-wrmsr`.
+   - Added new option `wrmsr` in `randomx` object with command line equivalent `--randomx-wrmsr=6`.
 - [#1396](https://github.com/xmrig/xmrig/pull/1396) [#1401](https://github.com/xmrig/xmrig/pull/1401) New performance optimizations for Ryzen CPUs. 
 - [#1385](https://github.com/xmrig/xmrig/issues/1385) Added `max-threads-hint` option support for RandomX dataset initialization threads.  
 - [#1386](https://github.com/xmrig/xmrig/issues/1386) Added `priority` option support for RandomX dataset initialization threads. 
--- a/CHANGELOG_NEXT.md
+++ b/CHANGELOG_NEXT.md
@@ -0,0 +1,6 @@
+# v7.0.0
+- `src/base` is now a git submodule for the [base](https://github.com/xmrig/base) project, build instructions require slight update.
+- Removed config option `background` (only command line available). Switching to background now happens on a very early stage before any I/O.
+
+# Previous versions
+[doc/CHANGELOG_OLD.md](doc/CHANGELOG_OLD.md)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,45 +1,61 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.1)
 project(xmrig)

-option(WITH_LIBCPUID        "Enable libcpuid support" ON)
 option(WITH_HWLOC           "Enable hwloc support" ON)
 option(WITH_CN_LITE         "Enable CryptoNight-Lite algorithms family" ON)
 option(WITH_CN_HEAVY        "Enable CryptoNight-Heavy algorithms family" ON)
 option(WITH_CN_PICO         "Enable CryptoNight-Pico algorithm" ON)
-option(WITH_CN_GPU          "Enable CryptoNight-GPU algorithm" ON)
+option(WITH_CN_FEMTO        "Enable CryptoNight-UPX2 algorithm" ON)
 option(WITH_RANDOMX         "Enable RandomX algorithms family" ON)
 option(WITH_ARGON2          "Enable Argon2 algorithms family" ON)
+option(WITH_KAWPOW          "Enable KawPow algorithms family" ON)
+option(WITH_GHOSTRIDER      "Enable GhostRider algorithm" ON)
 option(WITH_HTTP            "Enable HTTP protocol support (client/server)" ON)
 option(WITH_DEBUG_LOG       "Enable debug log output" OFF)
 option(WITH_TLS             "Enable OpenSSL support" ON)
 option(WITH_ASM             "Enable ASM PoW implementations" ON)
+option(WITH_MSR             "Enable MSR mod & 1st-gen Ryzen fix" ON)
+option(WITH_ENV_VARS        "Enable environment variables support in config file" ON)
 option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF)
 option(WITH_OPENCL          "Enable OpenCL backend" ON)
+set(WITH_OPENCL_VERSION 200 CACHE STRING "Target OpenCL version")
+set_property(CACHE WITH_OPENCL_VERSION PROPERTY STRINGS 120 200 210 220)
 option(WITH_CUDA            "Enable CUDA backend" ON)
 option(WITH_NVML            "Enable NVML (NVIDIA Management Library) support (only if CUDA backend enabled)" ON)
+option(WITH_ADL             "Enable ADL (AMD Display Library) or sysfs support (only if OpenCL backend enabled)" ON)
 option(WITH_STRICT_CACHE    "Enable strict checks for OpenCL cache" ON)
 option(WITH_INTERLEAVE_DEBUG_LOG "Enable debug log for threads interleave" OFF)
+option(WITH_PROFILING       "Enable profiling for developers" OFF)
+option(WITH_SSE4_1          "Enable SSE 4.1 for Blake2" ON)
+option(WITH_VAES            "Enable VAES instructions for Cryptonight" ON)
+option(WITH_BENCHMARK       "Enable builtin RandomX benchmark and stress test" ON)
+option(WITH_SECURE_JIT      "Enable secure access to JIT memory" OFF)
+option(WITH_DMI             "Enable DMI/SMBIOS reader" ON)

 option(BUILD_STATIC         "Build static binary" OFF)
 option(ARM_TARGET           "Force use specific ARM target 8 or 7" 0)
 option(HWLOC_DEBUG          "Enable hwloc debug helpers and log" OFF)

+add_definitions(-DXMRIG_MINER_PROJECT)

-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+set(WITH_SODIUM     OFF)
+set(WITH_CRYPTONOTE ON)
+set(WITH_CRYPTO_OPS ON)
+set(WITH_COM        ON)
+set(WITH_EVENTS     OFF)

+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/src/base/cmake" "${CMAKE_SOURCE_DIR}/cmake")
+set(LIBS base)

-include (CheckIncludeFile)
-include (cmake/cpu.cmake)
-include (cmake/os.cmake)
-include (src/base/base.cmake)
-include (src/backend/backend.cmake)
+include(base)
+add_subdirectory(src/base)
+
+include(src/backend/backend.cmake)


 set(HEADERS
-    "${HEADERS_BASE}"
-    "${HEADERS_BASE_HTTP}"
    "${HEADERS_BACKEND}"
-    src/App.h
+    src/backend/common/interfaces/IMemoryPool.h
    src/core/config/Config_default.h
    src/core/config/Config_platform.h
    src/core/config/Config.h
@@ -47,18 +63,6 @@ set(HEADERS
    src/core/config/usage.h
    src/core/Controller.h
    src/core/Miner.h
-    src/net/interfaces/IJobResultListener.h
-    src/net/JobResult.h
-    src/net/JobResults.h
-    src/net/Network.h
-    src/net/NetworkState.h
-    src/net/strategies/DonateStrategy.h
-    src/Summary.h
-    src/version.h
-   )
-
-set(HEADERS_CRYPTO
-    src/backend/common/interfaces/IMemoryPool.h
    src/crypto/cn/asm/CryptonightR_template.h
    src/crypto/cn/c_blake256.h
    src/crypto/cn/c_groestl.h
@@ -74,138 +78,119 @@ set(HEADERS_CRYPTO
    src/crypto/cn/hash.h
    src/crypto/cn/skein_port.h
    src/crypto/cn/soft_aes.h
-    src/crypto/common/Algorithm.h
-    src/crypto/common/Coin.h
    src/crypto/common/HugePagesInfo.h
-    src/crypto/common/keccak.h
    src/crypto/common/MemoryPool.h
    src/crypto/common/Nonce.h
    src/crypto/common/portable/mm_malloc.h
    src/crypto/common/VirtualMemory.h
+    src/MinerApp.h
+    src/net/interfaces/IJobResultListener.h
+    src/net/JobResult.h
+    src/net/JobResults.h
+    src/net/Network.h
+    src/net/strategies/DonateStrategy.h
+    src/Summary.h
+    src/version.h
   )

 if (XMRIG_ARM)
-    set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/cn/CryptoNight_arm.h)
+    list(APPEND HEADERS src/crypto/cn/CryptoNight_arm.h)
 else()
-    set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/cn/CryptoNight_x86.h)
+    list(APPEND HEADERS src/crypto/cn/CryptoNight_x86.h)
 endif()

 set(SOURCES
-    "${SOURCES_BASE}"
-    "${SOURCES_BASE_HTTP}"
    "${SOURCES_BACKEND}"
-    src/App.cpp
    src/core/config/Config.cpp
    src/core/config/ConfigTransform.cpp
    src/core/Controller.cpp
    src/core/Miner.cpp
-    src/net/JobResults.cpp
-    src/net/Network.cpp
-    src/net/NetworkState.cpp
-    src/net/strategies/DonateStrategy.cpp
-    src/Summary.cpp
-    src/xmrig.cpp
-   )
-
-set(SOURCES_CRYPTO
    src/crypto/cn/c_blake256.c
    src/crypto/cn/c_groestl.c
    src/crypto/cn/c_jh.c
    src/crypto/cn/c_skein.c
    src/crypto/cn/CnCtx.cpp
    src/crypto/cn/CnHash.cpp
-    src/crypto/common/Algorithm.cpp
-    src/crypto/common/Coin.cpp
    src/crypto/common/HugePagesInfo.cpp
-    src/crypto/common/keccak.cpp
    src/crypto/common/MemoryPool.cpp
    src/crypto/common/Nonce.cpp
    src/crypto/common/VirtualMemory.cpp
+    src/MinerApp.cpp
+    src/net/JobResults.cpp
+    src/net/Network.cpp
+    src/net/strategies/DonateStrategy.cpp
+    src/Summary.cpp
+    src/xmrig.cpp
   )

+if (CMAKE_C_COMPILER_ID MATCHES GNU)
+    set_source_files_properties(src/crypto/cn/CnHash.cpp PROPERTIES COMPILE_FLAGS "-Ofast -fno-tree-vectorize")
+endif()
+
+if (WITH_VAES)
+    add_definitions(-DXMRIG_VAES)
+    list(APPEND HEADERS src/crypto/cn/CryptoNight_x86_vaes.h)
+    list(APPEND SOURCES src/crypto/cn/CryptoNight_x86_vaes.cpp)
+    if (CMAKE_C_COMPILER_ID MATCHES GNU OR CMAKE_C_COMPILER_ID MATCHES Clang)
+        set_source_files_properties(src/crypto/cn/CryptoNight_x86_vaes.cpp PROPERTIES COMPILE_FLAGS "-Ofast -fno-tree-vectorize -mavx2 -mvaes")
+    endif()
+endif()
+
 if (WITH_HWLOC)
-    list(APPEND HEADERS_CRYPTO
+    list(APPEND HEADERS
        src/crypto/common/NUMAMemoryPool.h
        )

-    list(APPEND SOURCES_CRYPTO
+    list(APPEND SOURCES
        src/crypto/common/NUMAMemoryPool.cpp
        src/crypto/common/VirtualMemory_hwloc.cpp
        )
 endif()

 if (XMRIG_OS_WIN)
-    list(APPEND SOURCES_OS
+    list(APPEND SOURCES
        res/app.rc
-        src/App_win.cpp
        src/crypto/common/VirtualMemory_win.cpp
        )
-
-    set(EXTRA_LIBS ws2_32 psapi iphlpapi userenv)
-elseif (XMRIG_OS_APPLE)
-    list(APPEND SOURCES_OS
-        src/App_unix.cpp
-        src/crypto/common/VirtualMemory_unix.cpp
-        )
 else()
-    list(APPEND SOURCES_OS
-        src/App_unix.cpp
-        src/crypto/common/VirtualMemory_unix.cpp
-        )
+    list(APPEND SOURCES src/crypto/common/VirtualMemory_unix.cpp)

-    if (XMRIG_OS_ANDROID)
-        set(EXTRA_LIBS pthread rt dl log)
-    elseif (XMRIG_OS_LINUX)
-        list(APPEND SOURCES_OS
+    if (XMRIG_OS_LINUX AND NOT XMRIG_OS_ANDROID)
+        list(APPEND SOURCES
            src/crypto/common/LinuxMemory.h
            src/crypto/common/LinuxMemory.cpp
            )
-
-        set(EXTRA_LIBS pthread rt dl)
-    elseif (XMRIG_OS_FREEBSD)
-        set(EXTRA_LIBS kvm pthread)
    endif()
 endif()

-add_definitions(/D__STDC_FORMAT_MACROS)
-add_definitions(/DUNICODE)
-
-find_package(UV REQUIRED)
-
-include(cmake/flags.cmake)
-include(cmake/randomx.cmake)
-include(cmake/argon2.cmake)
-include(cmake/OpenSSL.cmake)
-include(cmake/asm.cmake)
-include(cmake/cn-gpu.cmake)
-
-if (WITH_CN_LITE)
-    add_definitions(/DXMRIG_ALGO_CN_LITE)
-endif()
-
-if (WITH_CN_HEAVY)
-    add_definitions(/DXMRIG_ALGO_CN_HEAVY)
-endif()
-
-if (WITH_CN_PICO)
-    add_definitions(/DXMRIG_ALGO_CN_PICO)
-endif()
-
-if (WITH_EMBEDDED_CONFIG)
-    add_definitions(/DXMRIG_FEATURE_EMBEDDED_CONFIG)
-endif()
-
 include_directories(src)
 include_directories(src/3rdparty)
-include_directories(${UV_INCLUDE_DIR})

-if (BUILD_STATIC)
-    set(CMAKE_EXE_LINKER_FLAGS " -static")
+include(randomx)
+include(argon2)
+include(kawpow)
+include(ghostrider)
+include(asm)
+
+if (WITH_EMBEDDED_CONFIG)
+    add_definitions(-DXMRIG_FEATURE_EMBEDDED_CONFIG)
 endif()

-if (WITH_DEBUG_LOG)
-    add_definitions(/DAPP_DEBUG)
+include(src/hw/api/api.cmake)
+include(src/hw/dmi/dmi.cmake)
+
+add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES})
+target_link_libraries(${CMAKE_PROJECT_NAME} ${LIBS})
+
+if (WIN32)
+    add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/bin/WinRing0/WinRing0x64.sys" $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)
+    add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/scripts/benchmark_1M.cmd" $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)
+    add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/scripts/benchmark_10M.cmd" $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)
+    add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/scripts/pool_mine_example.cmd" $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)
+    add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/scripts/solo_mine_example.cmd" $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)
+    add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/scripts/rtm_ghostrider_example.cmd" $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)
 endif()

-add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${SOURCES_CPUID} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES} ${CN_GPU_SOURCES})
-target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY})
+if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_BUILD_TYPE STREQUAL Release AND NOT CMAKE_GENERATOR STREQUAL Xcode)
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_STRIP} ${CMAKE_PROJECT_NAME})
+endif()
--- a/README.md
+++ b/README.md
@@ -1,117 +1,36 @@
 # XMRig

-**:warning: [Monero will change PoW algorithm to RandomX on November 30.](https://github.com/xmrig/xmrig/issues/1204)**
-
 [![Github All Releases](https://img.shields.io/github/downloads/xmrig/xmrig/total.svg)](https://github.com/xmrig/xmrig/releases)
 [![GitHub release](https://img.shields.io/github/release/xmrig/xmrig/all.svg)](https://github.com/xmrig/xmrig/releases)
-[![GitHub Release Date](https://img.shields.io/github/release-date-pre/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/releases)
+[![GitHub Release Date](https://img.shields.io/github/release-date/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/releases)
 [![GitHub license](https://img.shields.io/github/license/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/blob/master/LICENSE)
 [![GitHub stars](https://img.shields.io/github/stars/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/stargazers)
 [![GitHub forks](https://img.shields.io/github/forks/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/network)

-XMRig High performance, open source, cross platform RandomX, CryptoNight and Argon2 CPU/GPU miner, with official support for Windows.
+XMRig is a high performance, open source, cross platform RandomX, KawPow, CryptoNight and [GhostRider](https://github.com/xmrig/xmrig/tree/master/src/crypto/ghostrider#readme) unified CPU/GPU miner and [RandomX benchmark](https://xmrig.com/benchmark). Official binaries are available for Windows, Linux, macOS and FreeBSD.

 ## Mining backends
- **CPU** (x64/x86/ARM)
+- **CPU** (x64/ARMv7/ARMv8)
 - **OpenCL** for AMD GPUs.
 - **CUDA** for NVIDIA GPUs via external [CUDA plugin](https://github.com/xmrig/xmrig-cuda).

-<img src="doc/screenshot_v5_2_0.png" width="833" >
-
 ## Download
-* Binary releases: https://github.com/xmrig/xmrig/releases
-* Git tree: https://github.com/xmrig/xmrig.git
-  * Clone with `git clone https://github.com/xmrig/xmrig.git` :hammer: [Build instructions](https://github.com/xmrig/xmrig/wiki/Build).
+* **[Binary releases](https://github.com/xmrig/xmrig/releases)**
+* **[Build from source](https://xmrig.com/docs/miner/build)**

 ## Usage
-The preferred way to configure the miner is the [JSON config file](src/config.json) as it is more flexible and human friendly. The command line interface does not cover all features, such as mining profiles for different algorithms. Important options can be changed during runtime without miner restart by editing the config file or executing API calls.
+The preferred way to configure the miner is the [JSON config file](https://xmrig.com/docs/miner/config) as it is more flexible and human friendly. The [command line interface](https://xmrig.com/docs/miner/command-line-options) does not cover all features, such as mining profiles for different algorithms. Important options can be changed during runtime without miner restart by editing the config file or executing [API](https://xmrig.com/docs/miner/api) calls.

-* **[xmrig.com/wizard](https://xmrig.com/wizard)** helps you create initial configuration for the miner.
-* **[workers.xmrig.info](http://workers.xmrig.info)** helps manage your miners via HTTP API.
-
-### Command line options
-```
-Network:
-  -o, --url=URL                 URL of mining server
-  -a, --algo=ALGO               mining algorithm https://xmrig.com/docs/algorithms
-      --coin=COIN               specify coin instead of algorithm
-  -u, --user=USERNAME           username for mining server
-  -p, --pass=PASSWORD           password for mining server
-  -O, --userpass=U:P            username:password pair for mining server
-  -k, --keepalive               send keepalived packet for prevent timeout (needs pool support)
-      --nicehash                enable nicehash.com support
-      --rig-id=ID               rig identifier for pool-side statistics (needs pool support)
-      --tls                     enable SSL/TLS support (needs pool support)
-      --tls-fingerprint=HEX     pool TLS certificate fingerprint for strict certificate pinning
-      --daemon                  use daemon RPC instead of pool for solo mining
-      --daemon-poll-interval=N  daemon poll interval in milliseconds (default: 1000)
-  -r, --retries=N               number of times to retry before switch to backup server (default: 5)
-  -R, --retry-pause=N           time to pause between retries (default: 5)
-      --user-agent              set custom user-agent string for pool
-      --donate-level=N          donate level, default 5%% (5 minutes in 100 minutes)
-      --donate-over-proxy=N     control donate over xmrig-proxy feature
-
-CPU backend:
-      --no-cpu                  disable CPU mining backend
-  -t, --threads=N               number of CPU threads
-  -v, --av=N                    algorithm variation, 0 auto select
-      --cpu-affinity            set process affinity to CPU core(s), mask 0x3 for cores 0 and 1
-      --cpu-priority            set process priority (0 idle, 2 normal to 5 highest)
-      --cpu-max-threads-hint=N  maximum CPU threads count (in percentage) hint for autoconfig
-      --cpu-memory-pool=N       number of 2 MB pages for persistent memory pool, -1 (auto), 0 (disable)
-      --cpu-no-yield            prefer maximum hashrate rather than system response/stability
-      --no-huge-pages           disable huge pages support
-      --asm=ASM                 ASM optimizations, possible values: auto, none, intel, ryzen, bulldozer
-      --randomx-init=N          threads count to initialize RandomX dataset
-      --randomx-no-numa         disable NUMA support for RandomX
-      --randomx-mode=MODE       RandomX mode: auto, fast, light
-      --randomx-1gb-pages       use 1GB hugepages for dataset (Linux only)
-      --randomx-wrmsr=N         write value (0-15) to Intel MSR register 0x1a4 or do nothing (-1) (Linux only)
-
-API:
-      --api-worker-id=ID        custom worker-id for API
-      --api-id=ID               custom instance ID for API
-      --http-host=HOST          bind host for HTTP API (default: 127.0.0.1)
-      --http-port=N             bind port for HTTP API
-      --http-access-token=T     access token for HTTP API
-      --http-no-restricted      enable full remote access to HTTP API (only if access token set)
-
-OpenCL backend:
-      --opencl                  enable OpenCL mining backend
-      --opencl-devices=N        comma separated list of OpenCL devices to use
-      --opencl-platform=N       OpenCL platform index or name
-      --opencl-loader=PATH      path to OpenCL-ICD-Loader (OpenCL.dll or libOpenCL.so)
-      --opencl-no-cache         disable OpenCL cache
-      --print-platforms         print available OpenCL platforms and exit
-
-CUDA backend:
-      --cuda                    enable CUDA mining backend
-      --cuda-loader=PATH        path to CUDA plugin (xmrig-cuda.dll or libxmrig-cuda.so)
-      --cuda-devices=N          comma separated list of CUDA devices to use
-      --cuda-bfactor-hint=N     bfactor hint for autoconfig (0-12)
-      --cuda-bsleep-hint=N      bsleep hint for autoconfig
-      --no-nvml                 disable NVML (NVIDIA Management Library) support
-
-Logging:
-  -S, --syslog                  use system log for output messages
-  -l, --log-file=FILE           log all output to a file
-      --print-time=N            print hashrate report every N seconds
-      --health-print-time=N     print health report every N seconds
-      --no-color                disable colored output
-
-Misc:
-  -c, --config=FILE             load a JSON-format configuration file
-  -B, --background              run the miner in the background
-  -V, --version                 output version information and exit
-  -h, --help                    display this help and exit
-      --dry-run                 test configuration and exit
-      --export-topology         export hwloc topology to a XML file and exit
-```
+* **[Wizard](https://xmrig.com/wizard)** helps you create initial configuration for the miner.
+* **[Workers](http://workers.xmrig.info)** helps manage your miners via HTTP API.

 ## Donations
-* Default donation 5% (5 minutes in 100 minutes) can be reduced to 1% via option `donate-level` or disabled in source code.
+* Default donation 1% (1 minute in 100 minutes) can be increased via option `donate-level` or disabled in source code.
 * XMR: `48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD`
-* BTC: `1P7ujsXeX7GxQwHNnJsRMgAdNkFZmNVqJT`
+
+## Developers
+* **[xmrig](https://github.com/xmrig)**
+* **[sech1](https://github.com/SChernykh)**

 ## Contacts
 * support@xmrig.com
--- a/bin/WinRing0/LICENSE
+++ b/bin/WinRing0/LICENSE
@@ -0,0 +1,21 @@
+Copyright (c) 2007-2009 OpenLibSys.org. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/bin/WinRing0/WinRing0x64.sys
+++ b/bin/WinRing0/WinRing0x64.sys
--- a/cmake/FindHWLOC.cmake
+++ b/cmake/FindHWLOC.cmake
@@ -1,25 +0,0 @@
-find_path(
-    HWLOC_INCLUDE_DIR
-    NAMES hwloc.h
-    PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS"
-    PATH_SUFFIXES "include"
-    NO_DEFAULT_PATH
-)
-
-find_path(HWLOC_INCLUDE_DIR NAMES hwloc.h)
-
-find_library(
-    HWLOC_LIBRARY
-    NAMES hwloc.a hwloc libhwloc
-    PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS"
-    PATH_SUFFIXES "lib"
-    NO_DEFAULT_PATH
-)
-
-find_library(HWLOC_LIBRARY NAMES hwloc.a hwloc libhwloc)
-
-set(HWLOC_LIBRARIES ${HWLOC_LIBRARY})
-set(HWLOC_INCLUDE_DIRS ${HWLOC_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(HWLOC DEFAULT_MSG HWLOC_LIBRARY HWLOC_INCLUDE_DIR)
--- a/cmake/FindUV.cmake
+++ b/cmake/FindUV.cmake
@@ -1,25 +0,0 @@
-find_path(
-    UV_INCLUDE_DIR
-    NAMES uv.h
-    PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS"
-    PATH_SUFFIXES "include"
-    NO_DEFAULT_PATH
-)
-
-find_path(UV_INCLUDE_DIR NAMES uv.h)
-
-find_library(
-    UV_LIBRARY
-    NAMES libuv.a uv libuv
-    PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS"
-    PATH_SUFFIXES "lib"
-    NO_DEFAULT_PATH
-)
-
-find_library(UV_LIBRARY NAMES libuv.a uv libuv)
-
-set(UV_LIBRARIES ${UV_LIBRARY})
-set(UV_INCLUDE_DIRS ${UV_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(UV DEFAULT_MSG UV_LIBRARY UV_INCLUDE_DIR)
--- a/cmake/OpenSSL.cmake
+++ b/cmake/OpenSSL.cmake
@@ -1,33 +0,0 @@
-if (WITH_TLS)
-    set(OPENSSL_ROOT_DIR ${XMRIG_DEPS})
-
-    if (WIN32)
-        set(OPENSSL_USE_STATIC_LIBS TRUE)
-        set(OPENSSL_MSVC_STATIC_RT TRUE)
-
-        set(EXTRA_LIBS ${EXTRA_LIBS} Crypt32)
-    elseif (APPLE)
-        set(OPENSSL_USE_STATIC_LIBS TRUE)
-    endif()
-
-    find_package(OpenSSL)
-
-    if (OPENSSL_FOUND)
-        set(TLS_SOURCES src/base/net/stratum/Tls.h src/base/net/stratum/Tls.cpp)
-        include_directories(${OPENSSL_INCLUDE_DIR})
-
-        if (WITH_HTTP)
-            set(TLS_SOURCES ${TLS_SOURCES} src/base/net/http/HttpsClient.h src/base/net/http/HttpsClient.cpp)
-        endif()
-    else()
-        message(FATAL_ERROR "OpenSSL NOT found: use `-DWITH_TLS=OFF` to build without TLS support")
-    endif()
-
-    add_definitions(/DXMRIG_FEATURE_TLS)
-else()
-    set(TLS_SOURCES "")
-    set(OPENSSL_LIBRARIES "")
-    remove_definitions(/DXMRIG_FEATURE_TLS)
-
-    set(CMAKE_PROJECT_NAME "${CMAKE_PROJECT_NAME}-notls")
-endif()
--- a/cmake/argon2.cmake
+++ b/cmake/argon2.cmake
@@ -1,18 +1,13 @@
 if (WITH_ARGON2)
-    add_definitions(/DXMRIG_ALGO_ARGON2)
-
-    list(APPEND HEADERS_CRYPTO
+    list(APPEND HEADERS
        src/crypto/argon2/Hash.h
        src/crypto/argon2/Impl.h
    )

-    list(APPEND SOURCES_CRYPTO
+    list(APPEND SOURCES
        src/crypto/argon2/Impl.cpp
    )

    add_subdirectory(src/3rdparty/argon2)
-    set(ARGON2_LIBRARY argon2)
-else()
-    remove_definitions(/DXMRIG_ALGO_ARGON2)
-    set(ARGON2_LIBRARY "")
+    list(APPEND LIBS argon2)
 endif()
--- a/cmake/asm.cmake
+++ b/cmake/asm.cmake
@@ -36,17 +36,16 @@ if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
    endif()

    add_library(${XMRIG_ASM_LIBRARY} STATIC ${XMRIG_ASM_FILES})
-    set(XMRIG_ASM_SOURCES
-        src/crypto/common/Assembly.h
+    list(APPEND HEADERS src/crypto/common/Assembly.h)
+
+    list(APPEND SOURCES
        src/crypto/common/Assembly.cpp
        src/crypto/cn/r/CryptonightR_gen.cpp
        )
    set_property(TARGET ${XMRIG_ASM_LIBRARY} PROPERTY LINKER_LANGUAGE C)

-    add_definitions(/DXMRIG_FEATURE_ASM)
+    list(APPEND LIBS ${XMRIG_ASM_LIBRARY})
+    add_definitions(-DXMRIG_FEATURE_ASM)
 else()
-    set(XMRIG_ASM_SOURCES "")
-    set(XMRIG_ASM_LIBRARY "")
-
-    remove_definitions(/DXMRIG_FEATURE_ASM)
+    set(WITH_ASM OFF)
 endif()
--- a/cmake/cn-gpu.cmake
+++ b/cmake/cn-gpu.cmake
@@ -1,25 +0,0 @@
-if (WITH_CN_GPU AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-
-    if (XMRIG_ARM)
-        set(CN_GPU_SOURCES src/crypto/cn/gpu/cn_gpu_arm.cpp)
-
-        if (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang)
-            set_source_files_properties(src/crypto/cn/gpu/cn_gpu_arm.cpp PROPERTIES COMPILE_FLAGS "-O3")
-        endif()
-    else()
-        set(CN_GPU_SOURCES src/crypto/cn/gpu/cn_gpu_avx.cpp src/crypto/cn/gpu/cn_gpu_ssse3.cpp)
-
-        if (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang)
-            set_source_files_properties(src/crypto/cn/gpu/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "-O3 -mavx2")
-            set_source_files_properties(src/crypto/cn/gpu/cn_gpu_ssse3.cpp PROPERTIES COMPILE_FLAGS "-O3")
-        elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-            set_source_files_properties(src/crypto/cn/gpu/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "/arch:AVX")
-        endif()
-    endif()
-
-    add_definitions(/DXMRIG_ALGO_CN_GPU)
-else()
-    set(CN_GPU_SOURCES "")
-
-    remove_definitions(/DXMRIG_ALGO_CN_GPU)
-endif()
--- a/cmake/cpu.cmake
+++ b/cmake/cpu.cmake
@@ -1,43 +0,0 @@
-if (NOT CMAKE_SYSTEM_PROCESSOR)
-    message(WARNING "CMAKE_SYSTEM_PROCESSOR not defined")
-endif()
-
-
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$")
-    add_definitions(/DRAPIDJSON_SSE2)
-endif()
-
-if (NOT ARM_TARGET)
-    if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|armv8-a)$")
-        set(ARM_TARGET 8)
-    elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l)$")
-        set(ARM_TARGET 7)
-    endif()
-endif()
-
-if (ARM_TARGET AND ARM_TARGET GREATER 6)
-    set(XMRIG_ARM     ON)
-    set(WITH_LIBCPUID OFF)
-    add_definitions(/DXMRIG_ARM)
-
-    message(STATUS "Use ARM_TARGET=${ARM_TARGET} (${CMAKE_SYSTEM_PROCESSOR})")
-
-    include(CheckCXXCompilerFlag)
-
-    if (ARM_TARGET EQUAL 8)
-        set(XMRIG_ARMv8 ON)
-        add_definitions(/DXMRIG_ARMv8)
-
-        CHECK_CXX_COMPILER_FLAG(-march=armv8-a+crypto XMRIG_ARM_CRYPTO)
-
-        if (XMRIG_ARM_CRYPTO)
-            add_definitions(/DXMRIG_ARM_CRYPTO)
-            set(ARM8_CXX_FLAGS "-march=armv8-a+crypto")
-        else()
-            set(ARM8_CXX_FLAGS "-march=armv8-a")
-        endif()
-    elseif (ARM_TARGET EQUAL 7)
-        set(XMRIG_ARMv7 ON)
-        add_definitions(/DXMRIG_ARMv7)
-    endif()
-endif()
--- a/cmake/flags.cmake
+++ b/cmake/flags.cmake
@@ -1,99 +0,0 @@
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD 11)
-
-set(CMAKE_C_STANDARD 99)
-set(CMAKE_C_STANDARD_REQUIRED ON)
-
-if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
-    set(CMAKE_BUILD_TYPE Release)
-endif()
-
-if (CMAKE_BUILD_TYPE STREQUAL "Release")
-    add_definitions(/DNDEBUG)
-endif()
-
-include(CheckSymbolExists)
-
-if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-strict-aliasing")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Ofast")
-
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fexceptions -fno-rtti -Wno-strict-aliasing -Wno-class-memaccess")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -s")
-
-    if (XMRIG_ARMv8)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARM8_CXX_FLAGS}")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARM8_CXX_FLAGS} -flax-vector-conversions")
-    elseif (XMRIG_ARMv7)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -flax-vector-conversions")
-    else()
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
-
-        add_definitions(/DHAVE_ROTR)
-    endif()
-
-    if (WIN32)
-        if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
-        else()
-            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -Wl,--large-address-aware")
-        endif()
-    else()
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
-    endif()
-
-    add_definitions(/D_GNU_SOURCE)
-
-    if (${CMAKE_VERSION} VERSION_LESS "3.1.0")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    endif()
-
-    #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -gdwarf-2")
-
-    add_definitions(/DHAVE_BUILTIN_CLEAR_CACHE)
-
-elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-    set(CMAKE_C_FLAGS_RELEASE "/MT /O2 /Oi /DNDEBUG /GL")
-    set(CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Oi /DNDEBUG /GL")
-
-    add_definitions(/D_CRT_SECURE_NO_WARNINGS)
-    add_definitions(/D_CRT_NONSTDC_NO_WARNINGS)
-    add_definitions(/DNOMINMAX)
-    add_definitions(/DHAVE_ROTR)
-
-elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
-
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Ofast -funroll-loops -fmerge-all-constants")
-
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fexceptions -fno-rtti -Wno-missing-braces")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -funroll-loops -fmerge-all-constants")
-
-    if (XMRIG_ARMv8)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARM8_CXX_FLAGS}")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARM8_CXX_FLAGS}")
-    elseif (XMRIG_ARMv7)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon -march=${CMAKE_SYSTEM_PROCESSOR}")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -march=${CMAKE_SYSTEM_PROCESSOR}")
-    else()
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
-
-        check_symbol_exists("_rotr" "x86intrin.h" HAVE_ROTR)
-        if (HAVE_ROTR)
-            add_definitions(/DHAVE_ROTR)
-        endif()
-    endif()
-
-endif()
-
-if (NOT WIN32)
-    check_symbol_exists("__builtin___clear_cache" "stdlib.h" HAVE_BUILTIN_CLEAR_CACHE)
-    if (HAVE_BUILTIN_CLEAR_CACHE)
-        add_definitions(/DHAVE_BUILTIN_CLEAR_CACHE)
-    endif()
-endif()
--- a/cmake/ghostrider.cmake
+++ b/cmake/ghostrider.cmake
@@ -0,0 +1,4 @@
+if (WITH_GHOSTRIDER)
+    add_subdirectory(src/crypto/ghostrider)
+    list(APPEND LIBS ghostrider)
+endif()
--- a/cmake/kawpow.cmake
+++ b/cmake/kawpow.cmake
@@ -0,0 +1,14 @@
+if (WITH_KAWPOW)
+    list(APPEND HEADERS
+        src/crypto/kawpow/KPCache.h
+        src/crypto/kawpow/KPHash.h
+    )
+
+    list(APPEND SOURCES
+        src/crypto/kawpow/KPCache.cpp
+        src/crypto/kawpow/KPHash.cpp
+    )
+
+    add_subdirectory(src/base/3rdparty/libethash)
+    list(INSERT LIBS 0 ethash)
+endif()
--- a/cmake/os.cmake
+++ b/cmake/os.cmake
@@ -1,45 +0,0 @@
-if (WIN32)
-    set(XMRIG_OS_WIN ON)
-elseif (APPLE)
-    set(XMRIG_OS_APPLE ON)
-
-    if (IOS OR CMAKE_SYSTEM_NAME STREQUAL iOS)
-        set(XMRIG_OS_IOS ON)
-    else()
-        set(XMRIG_OS_MACOS ON)
-    endif()
-else()
-    set(XMRIG_OS_UNIX ON)
-
-    if (ANDROID OR CMAKE_SYSTEM_NAME MATCHES "Android")
-        set(XMRIG_OS_ANDROID ON)
-    elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-        set(XMRIG_OS_LINUX ON)
-    elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-        set(XMRIG_OS_FREEBSD ON)
-    endif()
-endif()
-
-
-if (XMRIG_OS_WIN)
-    add_definitions(/DWIN32)
-    add_definitions(/DXMRIG_OS_WIN)
-elseif(XMRIG_OS_APPLE)
-    add_definitions(/DXMRIG_OS_APPLE)
-
-    if (XMRIG_OS_IOS)
-        add_definitions(/DXMRIG_OS_IOS)
-    else()
-        add_definitions(/DXMRIG_OS_MACOS)
-    endif()
-elseif(XMRIG_OS_UNIX)
-    add_definitions(/DXMRIG_OS_UNIX)
-
-    if (XMRIG_OS_ANDROID)
-        add_definitions(/DXMRIG_OS_ANDROID)
-    elseif (XMRIG_OS_LINUX)
-        add_definitions(/DXMRIG_OS_LINUX)
-    elseif (XMRIG_OS_FREEBSD)
-        add_definitions(/DXMRIG_OS_FREEBSD)
-    endif()
-endif()
--- a/cmake/randomx.cmake
+++ b/cmake/randomx.cmake
@@ -1,7 +1,5 @@
 if (WITH_RANDOMX)
-    add_definitions(/DXMRIG_ALGO_RANDOMX)
-
-    list(APPEND HEADERS_CRYPTO
+    list(APPEND HEADERS
        src/crypto/rx/Rx.h
        src/crypto/rx/RxAlgo.h
        src/crypto/rx/RxBasicStorage.h
@@ -13,11 +11,9 @@ if (WITH_RANDOMX)
        src/crypto/rx/RxVm.h
    )

-    list(APPEND SOURCES_CRYPTO
+    list(APPEND SOURCES
        src/crypto/randomx/aes_hash.cpp
        src/crypto/randomx/allocator.cpp
-        src/crypto/randomx/argon2_core.c
-        src/crypto/randomx/argon2_ref.c
        src/crypto/randomx/blake2_generator.cpp
        src/crypto/randomx/blake2/blake2b.c
        src/crypto/randomx/bytecode_machine.cpp
@@ -43,26 +39,40 @@ if (WITH_RANDOMX)
        src/crypto/rx/RxVm.cpp
    )

-    if (CMAKE_C_COMPILER_ID MATCHES MSVC)
+    if (WITH_ASM AND CMAKE_C_COMPILER_ID MATCHES MSVC)
        enable_language(ASM_MASM)
-        list(APPEND SOURCES_CRYPTO
+        list(APPEND SOURCES
             src/crypto/randomx/jit_compiler_x86_static.asm
             src/crypto/randomx/jit_compiler_x86.cpp
            )
-    elseif (NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-        list(APPEND SOURCES_CRYPTO
+    elseif (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+        list(APPEND SOURCES
             src/crypto/randomx/jit_compiler_x86_static.S
             src/crypto/randomx/jit_compiler_x86.cpp
            )
        # cheat because cmake and ccache hate each other
        set_property(SOURCE src/crypto/randomx/jit_compiler_x86_static.S PROPERTY LANGUAGE C)
    elseif (XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-        list(APPEND SOURCES_CRYPTO
+        list(APPEND SOURCES
             src/crypto/randomx/jit_compiler_a64_static.S
             src/crypto/randomx/jit_compiler_a64.cpp
            )
        # cheat because cmake and ccache hate each other
-        set_property(SOURCE src/crypto/randomx/jit_compiler_a64_static.S PROPERTY LANGUAGE C)
+        if (CMAKE_GENERATOR STREQUAL Xcode)
+            set_property(SOURCE src/crypto/randomx/jit_compiler_a64_static.S PROPERTY LANGUAGE ASM)
+        else()
+            set_property(SOURCE src/crypto/randomx/jit_compiler_a64_static.S PROPERTY LANGUAGE C)
+        endif()
+    else()
+        list(APPEND SOURCES src/crypto/randomx/jit_compiler_fallback.cpp)
+    endif()
+
+    if (WITH_SSE4_1)
+        list(APPEND SOURCES src/crypto/randomx/blake2/blake2b_sse41.c)
+
+        if (CMAKE_C_COMPILER_ID MATCHES GNU OR CMAKE_C_COMPILER_ID MATCHES Clang)
+            set_source_files_properties(src/crypto/randomx/blake2/blake2b_sse41.c PROPERTIES COMPILE_FLAGS -msse4.1)
+        endif()
    endif()

    if (CMAKE_CXX_COMPILER_ID MATCHES Clang)
@@ -70,18 +80,49 @@ if (WITH_RANDOMX)
    endif()

    if (WITH_HWLOC)
-        list(APPEND HEADERS_CRYPTO
-             src/crypto/rx/RxNUMAStorage.h
-            )
-
-        list(APPEND SOURCES_CRYPTO
-             src/crypto/rx/RxNUMAStorage.cpp
-            )
+        list(APPEND HEADERS src/crypto/rx/RxNUMAStorage.h)
+        list(APPEND SOURCES src/crypto/rx/RxNUMAStorage.cpp)
    endif()

-    if (XMRIG_OS_LINUX)
-        list(APPEND SOURCES_CRYPTO src/crypto/rx/Rx_linux.cpp)
+    if (WITH_MSR AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (XMRIG_OS_WIN OR XMRIG_OS_LINUX))
+        add_definitions(-DXMRIG_FEATURE_MSR -DXMRIG_FIX_RYZEN)
+
+        if (XMRIG_OS_WIN)
+            list(APPEND SOURCES
+                src/crypto/rx/RxFix_win.cpp
+                src/hw/msr/Msr_win.cpp
+                )
+        elseif (XMRIG_OS_LINUX)
+            list(APPEND SOURCES
+                src/crypto/rx/RxFix_linux.cpp
+                src/hw/msr/Msr_linux.cpp
+                )
+        endif()
+
+        list(APPEND HEADERS
+            src/crypto/rx/RxFix.h
+            src/crypto/rx/RxMsr.h
+            src/hw/msr/Msr.h
+            src/hw/msr/MsrItem.h
+            )
+
+        list(APPEND SOURCES
+            src/crypto/rx/RxMsr.cpp
+            src/hw/msr/Msr.cpp
+            src/hw/msr/MsrItem.cpp
+            )
+    else()
+        set(WITH_MSR OFF)
+    endif()
+
+    if (WITH_PROFILING)
+        add_definitions(-DXMRIG_FEATURE_PROFILING)
+
+        list(APPEND HEADERS src/crypto/rx/Profiler.h)
+        list(APPEND SOURCES src/crypto/rx/Profiler.cpp)
    endif()
-else()
-    remove_definitions(/DXMRIG_ALGO_RANDOMX)
 endif()
+
+
+message(STATUS "WITH_MSR        \t= ${WITH_MSR}")
+message(STATUS "WITH_PROFILING  \t= ${WITH_PROFILING}")
--- a/doc/ALGORITHMS.md
+++ b/doc/ALGORITHMS.md
@@ -6,37 +6,40 @@ Algorithm can be defined in 3 ways:
 2. Per pool `coin` option, currently only usable values for this option is `monero` and `arqma`.
 3. Per pool `algo` option.

-Option `coin` useful for pools without algorithm negotiation support or daemon to allow automatically switch algorithm in next hard fork.
+Option `coin` useful for pools without [algorithm negotiation](https://xmrig.com/docs/extensions/algorithm-negotiation) support or daemon to allow automatically switch algorithm in next hard fork. If you use xmrig-proxy don't need specify algorithm on miner side.

 ## Algorithm names

-| Name | Memory | Version | Notes |
-|------|--------|---------|-------|
-| `rx/arq` | 256 KB | 4.3.0+ | RandomARQ (RandomX variant for ArQmA). |
-| `rx/0` | 2 MB | 3.2.0+ | RandomX (Monero). |
-| `argon2/chukwa` | 512 KB | 3.1.0+ | Argon2id (Chukwa). |
-| `argon2/wrkz` | 256 KB | 3.1.0+ | Argon2id (WRKZ) |
-| `rx/wow` | 1 MB | 3.0.0+ | RandomWOW (RandomX variant for Wownero). |
-| `rx/loki` | 2 MB | 3.0.0+ | RandomXL (RandomX variant for Loki). |
-| `cn/fast` | 2 MB | 3.0.0+ | CryptoNight variant 1 with half iterations. |
-| `cn/rwz` | 2 MB | 2.14.0+ | CryptoNight variant 2 with 3/4 iterations and reversed shuffle operation. |
-| `cn/zls` | 2 MB | 2.14.0+ | CryptoNight variant 2 with 3/4 iterations. |
-| `cn/double` | 2 MB | 2.14.0+ | CryptoNight variant 2 with double iterations. |
-| `cn/r` | 2 MB | 2.13.0+ | CryptoNightR (Monero's variant 4). |
-| `cn/wow` | 2 MB | 2.12.0+ | CryptoNightR (Wownero). |
-| `cn/gpu` | 2 MB | 2.11.0+ | CryptoNight-GPU. |
-| `cn-pico` | 256 KB | 2.10.0+ | CryptoNight-Pico. |
-| `cn/half` | 2 MB | 2.9.0+ | CryptoNight variant 2 with half iterations. |
-| `cn/2` | 2 MB | 2.8.0+ | CryptoNight variant 2. |
-| `cn/xao` | 2 MB | 2.6.4+ | CryptoNight variant 0 (modified). |
-| `cn/rto` | 2 MB | 2.6.4+ | CryptoNight variant 1 (modified). |
-| `cn-heavy/tube` | 4 MB | 2.6.4+ | CryptoNight-Heavy (modified). |
-| `cn-heavy/xhv` | 4 MB | 2.6.3+ | CryptoNight-Heavy (modified). |
-| `cn-heavy/0` | 4 MB | 2.6.0+ | CryptoNight-Heavy. |
-| `cn/1` | 2 MB | 2.5.0+ | CryptoNight variant 1. |
-| `cn-lite/1` | 1 MB | 2.5.0+ | CryptoNight-Lite variant 1. |
-| `cn-lite/0` | 1 MB | 0.8.0+ | CryptoNight-Lite variant 0. |
-| `cn/0` | 2 MB | 0.5.0+ | CryptoNight (original). |
+| Name | Memory | Version | Description | Notes |
+|------|--------|---------|-------------|-------|
+| `kawpow` | - | 6.0.0+ | KawPow (Ravencoin) | GPU only |
+| `rx/keva` | 1 MB | 5.9.0+ | RandomKEVA (RandomX variant for Keva). |  |
+| `astrobwt` | 20 MB | 5.8.0+ | AstroBWT (Dero). |  |
+| `cn-pico/tlo` | 256 KB | 5.5.0+ | CryptoNight-Pico (Talleo). |  |
+| `rx/sfx` | 2 MB | 5.4.0+ | RandomSFX (RandomX variant for Safex). |  |
+| `rx/arq` | 256 KB | 4.3.0+ | RandomARQ (RandomX variant for ArQmA). |  |
+| `rx/0` | 2 MB | 3.2.0+ | RandomX (Monero). |  |
+| `argon2/chukwa` | 512 KB | 3.1.0+ | Argon2id (Chukwa). | CPU only |
+| `argon2/wrkz` | 256 KB | 3.1.0+ | Argon2id (WRKZ) | CPU only |
+| `rx/wow` | 1 MB | 3.0.0+ | RandomWOW (RandomX variant for Wownero). |  |
+| `rx/loki` | 2 MB | 3.0.0+ | RandomXL (RandomX variant for Loki). |  |
+| `cn/fast` | 2 MB | 3.0.0+ | CryptoNight variant 1 with half iterations. |  |
+| `cn/rwz` | 2 MB | 2.14.0+ | CryptoNight variant 2 with 3/4 iterations and reversed shuffle operation. |  |
+| `cn/zls` | 2 MB | 2.14.0+ | CryptoNight variant 2 with 3/4 iterations. |  |
+| `cn/double` | 2 MB | 2.14.0+ | CryptoNight variant 2 with double iterations. |  |
+| `cn/r` | 2 MB | 2.13.0+ | CryptoNightR (Monero's variant 4). |  |
+| `cn-pico` | 256 KB | 2.10.0+ | CryptoNight-Pico. |  |
+| `cn/half` | 2 MB | 2.9.0+ | CryptoNight variant 2 with half iterations. |  |
+| `cn/2` | 2 MB | 2.8.0+ | CryptoNight variant 2. |  |
+| `cn/xao` | 2 MB | 2.6.4+ | CryptoNight variant 0 (modified). |  |
+| `cn/rto` | 2 MB | 2.6.4+ | CryptoNight variant 1 (modified). |  |
+| `cn-heavy/tube` | 4 MB | 2.6.4+ | CryptoNight-Heavy (modified). |  |
+| `cn-heavy/xhv` | 4 MB | 2.6.3+ | CryptoNight-Heavy (modified). |  |
+| `cn-heavy/0` | 4 MB | 2.6.0+ | CryptoNight-Heavy. |  |
+| `cn/1` | 2 MB | 2.5.0+ | CryptoNight variant 1. |  |
+| `cn-lite/1` | 1 MB | 2.5.0+ | CryptoNight-Lite variant 1. |  |
+| `cn-lite/0` | 1 MB | 0.8.0+ | CryptoNight-Lite variant 0. |  |
+| `cn/0` | 2 MB | 0.5.0+ | CryptoNight (original). |  |

 ## Migration to v3
 Since version 3 mining [algorithm](#algorithm-names) should specified for each pool separately (`algo` option), earlier versions was use one global `algo` option and per pool `variant` option (this option was removed in v3). If your pool support [mining algorithm negotiation](https://github.com/xmrig/xmrig-proxy/issues/168) you may not specify this option at all.
--- a/doc/BENCHMARK.md
+++ b/doc/BENCHMARK.md
@@ -0,0 +1,29 @@
+# Embedded benchmark
+
+You can run with XMRig with the following commands:
+```
+xmrig --bench=1M
+xmrig --bench=10M
+xmrig --bench=1M -a rx/wow
+xmrig --bench=10M -a rx/wow
+```
+This will run between 1 and 10 million RandomX hashes, depending on `bench` parameter, and print the time it took. First two commands use Monero variant (2 MB per thread, best for Zen2/Zen3 CPUs), second two commands use Wownero variant (1 MB per thread, useful for Intel and 1st gen Zen/Zen+ CPUs).
+
+Checksum of all the hashes will be also printed to check stability of your hardware: if it's green then it's correct, if it's red then there was hardware error during computation. No Internet connection is required for the benchmark.
+
+Double check that you see `Huge pages 100%` both for dataset and for all threads, and also check for `msr register values ... has been set successfully` - without this result will be far from the best. Running as administrator is required for MSR and huge pages to be set up properly.
+
+![Benchmark example](https://i.imgur.com/PST3BYc.png)
+
+### Benchmark with custom config
+
+You can run benchmark with any configuration you want. Just start without command line parameteres, use regular config.json and add `"benchmark":"1M",` on the next line after pool url. 
+
+# Stress test
+
+You can also run continuous stress-test that is as close to the real RandomX mining as possible and doesn't require any configuration:
+```
+xmrig --stress
+xmrig --stress -a rx/wow
+```
+This will require Internet connection and will run indefinitely.
--- a/doc/CPU.md
+++ b/doc/CPU.md
@@ -1,3 +1,5 @@
+**:warning: Recent version of this page https://xmrig.com/docs/miner/config/cpu.**
+
 # CPU backend

 All CPU related settings contains in one `cpu` object in config file, CPU backend allow specify multiple profiles and allow switch between them without restrictions by pool request or config change. Default auto-configuration create reasonable minimum of profiles which cover all supported algorithms.
@@ -75,6 +77,35 @@ Each number represent one thread and means CPU affinity, this is default format
 ```
 Internal format, but can be user defined.

+## RandomX options
+
+#### `init`
+Thread count to initialize RandomX dataset. Auto-detect (`-1`) or any number greater than 0 to use that many threads.
+
+#### `init-avx2`
+Use AVX2 for dataset initialization. Faster on some CPUs. Auto-detect (`-1`), disabled (`0`), always enabled on CPUs that support AVX2 (`1`).
+
+#### `mode`
+RandomX mining mode: `auto`, `fast` (2 GB memory), `light` (256 MB memory).
+
+#### `1gb-pages`
+Use 1GB hugepages for RandomX dataset (Linux only). Enabled (`true`) or disabled (`false`). It gives 1-3% speedup.
+
+#### `wrmsr`
+[MSR mod](https://xmrig.com/docs/miner/randomx-optimization-guide/msr). Enabled (`true`) or disabled (`false`). It gives up to 15% speedup depending on your system. _(**Note**: Userspace MSR writes are no longer enabled by default; the flag `msr.allow_writes=on` must be set for Linux Kernels 5.9 and after.)_
+
+#### `rdmsr`
+Restore MSR register values to their original values on exit. Used together with `wrmsr`. Enabled (`true`) or disabled (`false`).
+
+#### `cache_qos`
+[Cache QoS](https://xmrig.com/docs/miner/randomx-optimization-guide/qos). Enabled (`true`) or disabled (`false`). It's useful when you can't or don't want to mine on all CPU cores to make mining hashrate more stable.
+
+#### `numa`
+NUMA support (better hashrate on multi-CPU servers and Ryzen Threadripper 1xxx/2xxx). Enabled (`true`) or disabled (`false`).
+
+#### `scratchpad_prefetch_mode`
+Which instruction to use in RandomX loop to prefetch data from scratchpad. `1` is default and fastest in most cases. Can be off (`0`), `prefetcht0` instruction (`1`), `prefetchnta` instruction (`2`, a bit faster on Coffee Lake and a few other CPUs), `mov` instruction (`3`).
+
 ## Shared options

 #### `enabled`
@@ -83,23 +114,32 @@ Enable (`true`) or disable (`false`) CPU backend, by default `true`.
 #### `huge-pages`
 Enable (`true`) or disable (`false`) huge pages support, by default `true`.

+#### `huge-pages-jit`
+Enable (`true`) or disable (`false`) huge pages support for RandomX JIT code, by default `false`. It gives a very small boost on Ryzen CPUs, but hashrate is unstable between launches. Use with caution.
+
 #### `hw-aes`
 Force enable (`true`) or disable (`false`) hardware AES support. Default value `null` means miner autodetect this feature. Usually don't need change this option, this option useful for some rare cases when miner can't detect hardware AES, but it available. If you force enable this option, but your hardware not support it, miner will crash.

 #### `priority`
-Mining threads priority, value from `1` (lowest priority) to `5` (highest possible priority). Default value `null` means miner don't change threads priority at all.
+Mining threads priority, value from `1` (lowest priority) to `5` (highest possible priority). Default value `null` means miner don't change threads priority at all. Setting priority higher than 2 can make your PC unresponsive.
+
+#### `memory-pool` (since v4.3.0)
+Use continuous, persistent memory block for mining threads, useful for preserve huge pages allocation while algorithm switching. Possible values `false` (feature disabled, by default) or `true` or specific count of 2 MB huge pages. It helps to avoid loosing huge pages for scratchpads when RandomX dataset is updated and mining threads restart after a 2-3 days of mining.
+
+#### `yield` (since v5.1.1)
+Prefer system better system response/stability `true` (default value) or maximum hashrate `false`.

 #### `asm`
 Enable/configure or disable ASM optimizations. Possible values: `true`, `false`, `"intel"`, `"ryzen"`, `"bulldozer"`.

 #### `argon2-impl` (since v3.1.0)
-Allow override automatically detected Argon2 implementation, this option added mostly for debug purposes, default value `null` means autodetect. Other possible values: `"x86_64"`, `"SSE2"`, `"SSSE3"`, `"XOP"`, `"AVX2"`, `"AVX-512F"`. Manual selection has no safe guards, if you CPU not support required instuctions, miner will crash.
+Allow override automatically detected Argon2 implementation, this option added mostly for debug purposes, default value `null` means autodetect. This is used in RandomX dataset initialization and also in some other mining algorithms. Other possible values: `"x86_64"`, `"SSE2"`, `"SSSE3"`, `"XOP"`, `"AVX2"`, `"AVX-512F"`. Manual selection has no safe guards - if your CPU doesn't support required instuctions, miner will crash.
+
+#### `astrobwt-max-size`
+AstroBWT algorithm: skip hashes with large stage 2 size, default: `550`, min: `400`, max: `1200`. Optimal value depends on your CPU/GPU
+
+#### `astrobwt-avx2`
+AstroBWT algorithm: use AVX2 code. It's faster on some CPUs and slower on other

 #### `max-threads-hint` (since v4.2.0)
 Maximum CPU threads count (in percentage) hint for autoconfig. [CPU_MAX_USAGE.md](CPU_MAX_USAGE.md)
-
-#### `memory-pool` (since v4.3.0)
-Use continuous, persistent memory block for mining threads, useful for preserve huge pages allocation while algorithm swithing. Possible values `false` (feature disabled, by default) or `true` or specific count of 2 MB huge pages.
-
-#### `yield` (since v5.1.1)
-Prefer system better system response/stability `true` (default value) or maximum hashrate `false`.
--- a/doc/build/CMAKE_OPTIONS.md
+++ b/doc/build/CMAKE_OPTIONS.md
@@ -6,7 +6,6 @@
 * **`-DWITH_CN_LITE=OFF`** disable all CryptoNight-Lite algorithms (`cn-lite/0`, `cn-lite/1`).
 * **`-DWITH_CN_HEAVY=OFF`** disable all CryptoNight-Heavy algorithms (`cn-heavy/0`, `cn-heavy/xhv`, `cn-heavy/tube`).
 * **`-DWITH_CN_PICO=OFF`** disable CryptoNight-Pico algorithm (`cn-pico`).
-* **`-DWITH_CN_GPU=OFF`** disable CryptoNight-GPU algorithm (`cn/gpu`).
 * **`-DWITH_RANDOMX=OFF`** disable RandomX algorithms (`rx/loki`, `rx/wow`).
 * **`-DWITH_ARGON2=OFF`** disable Argon2 algorithms (`argon2/chukwa`, `argon2/wrkz`).

@@ -23,6 +22,7 @@ This feature add external dependency to libhwloc (1.10.0+) (except MSVC builds).
 * **`-DWITH_EMBEDDED_CONFIG=ON`** Enable [embedded](https://github.com/xmrig/xmrig/issues/957) config support.
 * **`-DWITH_OPENCL=OFF`** Disable OpenCL backend.
 * **`-DWITH_CUDA=OFF`** Disable CUDA backend.
+* **`-DWITH_SSE4_1=OFF`** Disable SSE 4.1 for Blake2 (useful for arm builds).

 ## Debug options

--- a/doc/releases/5_0_1/SHA256SUMS
+++ b/doc/releases/5_0_1/SHA256SUMS
@@ -1,5 +0,0 @@
-6bb1a2e3a0fbca5195be6022f2a9fbff8a353c37c7542e7ab89420cb45b64505  xmrig-5.0.1-gcc-win32.zip
-24dba9ec281acfb2ea2c401ebd0e4e2d1f1ee5fd557da5ff3c7049020c1f78b6  xmrig-5.0.1-gcc-win64.zip
-86d65c6693ec9e35cd7547329580638b85c9eb0cf8383892a1c15199de5b556f  xmrig-5.0.1-msvc-cuda10_1-win64.zip
-0fbfe518b1c4b6993b0f66ff01302626375b15620ccf8f64d6fb97845068ffca  xmrig-5.0.1-msvc-win64.zip
-aa34890738a3494de2fa0e44db346937fea7339852f5f10b5d4655f95e2d8f1f  xmrig-5.0.1-xenial-x64.tar.gz
--- a/doc/releases/5_0_1/SHA256SUMS.sig
+++ b/doc/releases/5_0_1/SHA256SUMS.sig
@@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEmsTOqOZuNaXHzdwbRGpTY4vpRAkFAl3VcsoACgkQRGpTY4vp
-RAm9vQgA1MyTUU2jley2TCYLUzQy2Fffc8fbXYv64r44jbWOjC/6qo2iIlRgPhIc
-oVyPKr5TYS3QjDzCEm8IvozS0YudS6soESbPzqDonboK8pd0K4bsML9TQY2feV7A
-NL5vln0rfVHp1wxLLrQpfBqAgvJUXEyaHece6gFQN79JOGhEo2bHL2NyrOl+FViS
-b2BaMtXq410Fh+XT6ShnOaG/2EuO8ZqSGdCO6A/2LHQw1UY+mZiCvue6P6B06HmB
-WD/urOv38V389v+V+Sp4UlEW6VpBOOjvtChoVWtLt+tKzydrnt2EmoWWWg475pka
-4G6whHuMWS8CTt5/PDhJpvVXNQTIOw==
-=C764
-----END PGP SIGNATURE-----
--- a/res/app.rc
+++ b/res/app.rc
@@ -20,7 +20,7 @@ VS_VERSION_INFO VERSIONINFO
    BEGIN
      BLOCK "000004b0"
      BEGIN
-        VALUE "CompanyName",      APP_SITE
+        VALUE "CompanyName",      APP_DOMAIN
        VALUE "FileDescription",  APP_DESC
        VALUE "FileVersion",      APP_VERSION
        VALUE "LegalCopyright",   APP_COPYRIGHT
--- a/scripts/benchmark_10M.cmd
+++ b/scripts/benchmark_10M.cmd
@@ -0,0 +1,4 @@
+@echo off
+cd %~dp0
+xmrig.exe --bench=10M --submit
+pause
--- a/scripts/benchmark_1M.cmd
+++ b/scripts/benchmark_1M.cmd
@@ -0,0 +1,4 @@
+@echo off
+cd %~dp0
+xmrig.exe --bench=1M --submit
+pause
--- a/scripts/build.hwloc.sh
+++ b/scripts/build.hwloc.sh
@@ -0,0 +1,23 @@
+#!/bin/bash -e
+
+HWLOC_VERSION_MAJOR="2"
+HWLOC_VERSION_MINOR="7"
+HWLOC_VERSION_PATCH="1"
+
+HWLOC_VERSION="${HWLOC_VERSION_MAJOR}.${HWLOC_VERSION_MINOR}.${HWLOC_VERSION_PATCH}"
+
+mkdir -p deps
+mkdir -p deps/include
+mkdir -p deps/lib
+
+mkdir -p build && cd build
+
+wget https://download.open-mpi.org/release/hwloc/v${HWLOC_VERSION_MAJOR}.${HWLOC_VERSION_MINOR}/hwloc-${HWLOC_VERSION}.tar.gz -O hwloc-${HWLOC_VERSION}.tar.gz
+tar -xzf hwloc-${HWLOC_VERSION}.tar.gz
+
+cd hwloc-${HWLOC_VERSION}
+./configure --disable-shared --enable-static --disable-io --disable-libudev --disable-libxml2
+make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
+cp -fr include ../../deps
+cp hwloc/.libs/libhwloc.a ../../deps/lib
+cd ..
--- a/scripts/build.hwloc1.sh
+++ b/scripts/build.hwloc1.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+HWLOC_VERSION="1.11.13"
+
+mkdir -p deps
+mkdir -p deps/include
+mkdir -p deps/lib
+
+mkdir -p build && cd build
+
+wget https://download.open-mpi.org/release/hwloc/v1.11/hwloc-${HWLOC_VERSION}.tar.gz -O hwloc-${HWLOC_VERSION}.tar.gz
+tar -xzf hwloc-${HWLOC_VERSION}.tar.gz
+
+cd hwloc-${HWLOC_VERSION}
+./configure --disable-shared --enable-static --disable-io --disable-libudev --disable-libxml2
+make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
+cp -fr include ../../deps
+cp src/.libs/libhwloc.a ../../deps/lib
+cd ..
--- a/scripts/build.libressl.sh
+++ b/scripts/build.libressl.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+LIBRESSL_VERSION="3.5.2"
+
+mkdir -p deps
+mkdir -p deps/include
+mkdir -p deps/lib
+
+mkdir -p build && cd build
+
+wget https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRESSL_VERSION}.tar.gz -O libressl-${LIBRESSL_VERSION}.tar.gz
+tar -xzf libressl-${LIBRESSL_VERSION}.tar.gz
+
+cd libressl-${LIBRESSL_VERSION}
+./configure --disable-shared
+make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
+cp -fr include ../../deps
+cp crypto/.libs/libcrypto.a ../../deps/lib
+cp ssl/.libs/libssl.a ../../deps/lib
+cd ..
--- a/scripts/build.openssl.sh
+++ b/scripts/build.openssl.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+OPENSSL_VERSION="1.1.1o"
+
+mkdir -p deps
+mkdir -p deps/include
+mkdir -p deps/lib
+
+mkdir -p build && cd build
+
+wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O openssl-${OPENSSL_VERSION}.tar.gz
+tar -xzf openssl-${OPENSSL_VERSION}.tar.gz
+
+cd openssl-${OPENSSL_VERSION}
+./config -no-shared -no-asm -no-zlib -no-comp -no-dgram -no-filenames -no-cms
+make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
+cp -fr include ../../deps
+cp libcrypto.a ../../deps/lib
+cp libssl.a ../../deps/lib
+cd ..
--- a/scripts/build.openssl3.sh
+++ b/scripts/build.openssl3.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+OPENSSL_VERSION="3.0.3"
+
+mkdir -p deps
+mkdir -p deps/include
+mkdir -p deps/lib
+
+mkdir -p build && cd build
+
+wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O openssl-${OPENSSL_VERSION}.tar.gz
+tar -xzf openssl-${OPENSSL_VERSION}.tar.gz
+
+cd openssl-${OPENSSL_VERSION}
+./config -no-shared -no-asm -no-zlib -no-comp -no-dgram -no-filenames -no-cms
+make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
+cp -fr include ../../deps
+cp libcrypto.a ../../deps/lib
+cp libssl.a ../../deps/lib
+cd ..
--- a/scripts/build.uv.sh
+++ b/scripts/build.uv.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+UV_VERSION="1.44.1"
+
+mkdir -p deps
+mkdir -p deps/include
+mkdir -p deps/lib
+
+mkdir -p build && cd build
+
+wget https://github.com/libuv/libuv/archive/v${UV_VERSION}.tar.gz -O v${UV_VERSION}.tar.gz
+tar -xzf v${UV_VERSION}.tar.gz
+
+cd libuv-${UV_VERSION}
+sh autogen.sh
+./configure --disable-shared
+make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
+cp -fr include ../../deps
+cp .libs/libuv.a ../../deps/lib
+cd ..
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -1,43 +1,5 @@
 #!/bin/bash -e

-UV_VERSION="1.34.0"
-OPENSSL_VERSION="1.1.1d"
-HWLOC_VERSION="2.1.0"
-
-mkdir deps
-mkdir deps/include
-mkdir deps/lib
-
-mkdir build && cd build
-
-wget https://github.com/libuv/libuv/archive/v${UV_VERSION}.tar.gz
-tar -xzf v${UV_VERSION}.tar.gz
-
-wget https://download.open-mpi.org/release/hwloc/v2.1/hwloc-${HWLOC_VERSION}.tar.bz2
-tar -xjf hwloc-${HWLOC_VERSION}.tar.bz2
-
-wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
-tar -xzf openssl-${OPENSSL_VERSION}.tar.gz
-
-cd libuv-${UV_VERSION}
-sh autogen.sh
-./configure --disable-shared
-make -j$(nproc)
-cp -fr include/ ../../deps
-cp .libs/libuv.a ../../deps/lib
-cd ..
-
-cd hwloc-${HWLOC_VERSION}
-./configure --disable-shared --enable-static --disable-io --disable-libudev --disable-libxml2
-make -j$(nproc)
-cp -fr include/ ../../deps
-cp hwloc/.libs/libhwloc.a ../../deps/lib
-cd ..
-
-cd openssl-${OPENSSL_VERSION}
-./config -no-shared -no-asm -no-zlib -no-comp -no-dgram -no-filenames -no-cms
-make -j$(nproc)
-cp -fr include/ ../../deps
-cp libcrypto.a ../../deps/lib
-cp libssl.a ../../deps/lib
-cd ../..
+./build.uv.sh
+./build.hwloc.sh
+./build.openssl.sh
--- a/scripts/enable_1gb_pages.sh
+++ b/scripts/enable_1gb_pages.sh
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+
+# https://xmrig.com/docs/miner/hugepages#onegb-huge-pages
+
+sysctl -w vm.nr_hugepages=$(nproc)
+
+for i in $(find /sys/devices/system/node/node* -maxdepth 0 -type d);
+do
+    echo 3 > "$i/hugepages/hugepages-1048576kB/nr_hugepages";
+done
+
+echo "1GB pages successfully enabled"
--- a/scripts/generate_cl.js
+++ b/scripts/generate_cl.js
@@ -43,23 +43,15 @@ function cn_r()
 }


-function cn_gpu()
-{
-    const cn_gpu = opencl_minify(addIncludes('cryptonight_gpu.cl', [ 'wolf-aes.cl', 'keccak.cl' ]));
-
-    // fs.writeFileSync('cryptonight_gpu_gen.cl', cn_gpu);
-    fs.writeFileSync('cryptonight_gpu_cl.h', text2h(cn_gpu, 'xmrig', 'cryptonight_gpu_cl'));
-}
-
-
 function rx()
 {
    let rx = addIncludes('randomx.cl', [
        '../cn/algorithm.cl',
        'randomx_constants_monero.h',
        'randomx_constants_wow.h',
-        'randomx_constants_loki.h',
        'randomx_constants_arqma.h',
+        'randomx_constants_keva.h',
+        'randomx_constants_graft.h',
        'aes.cl',
        'blake2b.cl',
        'randomx_vm.cl',
@@ -75,13 +67,28 @@ function rx()
 }


+function kawpow()
+{
+    const kawpow = opencl_minify(addIncludes('kawpow.cl', [ 'defs.h' ]));
+    const kawpow_dag = opencl_minify(addIncludes('kawpow_dag.cl', [ 'defs.h' ]));
+
+    // fs.writeFileSync('kawpow_gen.cl', kawpow);
+    fs.writeFileSync('kawpow_cl.h', text2h(kawpow, 'xmrig', 'kawpow_cl'));
+    fs.writeFileSync('kawpow_dag_cl.h', text2h(kawpow_dag, 'xmrig', 'kawpow_dag_cl'));
+}
+
+
 process.chdir(path.resolve('src/backend/opencl/cl/cn'));

 cn();
 cn_r();
-cn_gpu();

 process.chdir(cwd);
 process.chdir(path.resolve('src/backend/opencl/cl/rx'));

-rx();
+rx();
+
+process.chdir(cwd);
+process.chdir(path.resolve('src/backend/opencl/cl/kawpow'));
+
+kawpow();
--- a/scripts/js/opencl.js
+++ b/scripts/js/opencl.js
@@ -6,7 +6,7 @@ const fs = require('fs');
 function bin2h(buf, namespace, name)
 {
    const size = buf.byteLength;
-    let out    = `#pragma once\n\nnamespace ${namespace} {\n\nstatic unsigned char ${name}[${size}] = {\n    `;
+    let out    = `#pragma once\n\nnamespace ${namespace} {\n\nstatic const unsigned char ${name}[${size}] = {\n    `;

    let b = 32;
    for (let i = 0; i < size; i++) {
@@ -28,7 +28,7 @@ function text2h_internal(text, name)
 {
    const buf  = Buffer.from(text);
    const size = buf.byteLength;
-    let out    = `\nstatic char ${name}[${size + 1}] = {\n    `;
+    let out    = `\nstatic const char ${name}[${size + 1}] = {\n    `;

    let b = 32;
    for (let i = 0; i < size; i++) {
--- a/scripts/pool_mine_example.cmd
+++ b/scripts/pool_mine_example.cmd
@@ -0,0 +1,20 @@
+:: Example batch file for mining Monero at a pool
+::
+:: Format:
+::	xmrig.exe -o <pool address>:<pool port> -u <pool username/wallet> -p <pool password>
+::
+:: Fields:
+::	pool address		The host name of the pool stratum or its IP address, for example pool.hashvault.pro
+::	pool port 		The port of the pool's stratum to connect to, for example 3333. Check your pool's getting started page.
+::	pool username/wallet 	For most pools, this is the wallet address you want to mine to. Some pools require a username
+::	pool password 		For most pools this can be just 'x'. For pools using usernames, you may need to provide a password as configured on the pool.
+::
+:: List of Monero mining pools:
+::	https://miningpoolstats.stream/monero
+::
+:: Choose pools outside of top 5 to help Monero network be more decentralized!
+:: Smaller pools also often have smaller fees/payout limits.
+
+cd %~dp0
+xmrig.exe -o pool.hashvault.pro:3333 -u 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD -p x
+pause
--- a/scripts/randomx_boost.sh
+++ b/scripts/randomx_boost.sh
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+
+MSR_FILE=/sys/module/msr/parameters/allow_writes
+
+if test -e "$MSR_FILE"; then
+	echo on > $MSR_FILE
+else
+	modprobe msr allow_writes=on
+fi
+
+if grep -E 'AMD Ryzen|AMD EPYC' /proc/cpuinfo > /dev/null;
+	then
+	if grep "cpu family[[:space:]]:[[:space:]]25" /proc/cpuinfo > /dev/null;
+		then
+			echo "Detected Zen3 CPU"
+			wrmsr -a 0xc0011020 0x4480000000000
+			wrmsr -a 0xc0011021 0x1c000200000040
+			wrmsr -a 0xc0011022 0xc000000401500000
+			wrmsr -a 0xc001102b 0x2000cc14
+			echo "MSR register values for Zen3 applied"
+		else
+			echo "Detected Zen1/Zen2 CPU"
+			wrmsr -a 0xc0011020 0
+			wrmsr -a 0xc0011021 0x40
+			wrmsr -a 0xc0011022 0x1510000
+			wrmsr -a 0xc001102b 0x2000cc16
+			echo "MSR register values for Zen1/Zen2 applied"
+		fi
+elif grep "Intel" /proc/cpuinfo > /dev/null;
+	then
+		echo "Detected Intel CPU"
+		wrmsr -a 0x1a4 0xf
+		echo "MSR register values for Intel applied"
+else
+	echo "No supported CPU detected"
+fi
--- a/scripts/rtm_ghostrider_example.cmd
+++ b/scripts/rtm_ghostrider_example.cmd
@@ -0,0 +1,23 @@
+:: Example batch file for mining Raptoreum at a pool
+::
+:: Format:
+::      xmrig.exe -a gr -o <pool address>:<pool port> -u <pool username/wallet> -p <pool password>
+::
+:: Fields:
+::      pool address            The host name of the pool stratum or its IP address, for example raptoreumemporium.com
+::      pool port               The port of the pool's stratum to connect to, for example 3333. Check your pool's getting started page.
+::      pool username/wallet    For most pools, this is the wallet address you want to mine to. Some pools require a username
+::      pool password           For most pools this can be just 'x'. For pools using usernames, you may need to provide a password as configured on the pool.
+::
+:: List of Raptoreum mining pools:
+::      https://miningpoolstats.stream/raptoreum
+::
+:: Choose pools outside of top 5 to help Raptoreum network be more decentralized!
+:: Smaller pools also often have smaller fees/payout limits.
+
+cd %~dp0
+:: Use this command line to connect to non-SSL port
+xmrig.exe -a gr -o raptoreumemporium.com:3008 -u WALLET_ADDRESS -p x
+:: Or use this command line to connect to an SSL port
+:: xmrig.exe -a gr -o rtm.suprnova.cc:4273 --tls -u WALLET_ADDRESS -p x
+pause
--- a/scripts/solo_mine_example.cmd
+++ b/scripts/solo_mine_example.cmd
@@ -0,0 +1,16 @@
+:: Example batch file for mining Monero solo
+::
+:: Format:
+::	xmrig.exe -o <node address>:<node port> -a rx/0 -u <wallet address> --daemon
+::
+:: Fields:
+::	node address		The host name of your monerod node or its IP address. It can also be a public node with RPC enabled, for example node.xmr.to
+::	node port 		The RPC port of your monerod node to connect to, usually 18081.
+::	wallet address		Check your Monero CLI or GUI wallet to see your wallet's address.
+::
+:: Mining solo is the best way to help Monero network be more decentralized!
+:: But you will only get a payout when you find a block which can take more than a year for a single low-end PC.
+
+cd %~dp0
+xmrig.exe -o node.xmr.to:18081 -a rx/0 -u 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD --daemon
+pause
--- a/src/3rdparty/CL/cl_dx9_media_sharing.h
+++ b/src/3rdparty/CL/cl_dx9_media_sharing.h
@@ -44,7 +44,7 @@ extern "C" {

 typedef cl_uint             cl_dx9_media_adapter_type_khr;
 typedef cl_uint             cl_dx9_media_adapter_set_khr;
-    
+
 #if defined(_WIN32)
 #include <d3d9.h>
 typedef struct _cl_dx9_surface_info_khr
@@ -105,7 +105,7 @@ typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceKHR_fn)(
    cl_mem_flags                  flags,
    cl_dx9_media_adapter_type_khr adapter_type,
    void *                        surface_info,
-    cl_uint                       plane,                                                                          
+    cl_uint                       plane,
    cl_int *                      errcode_ret) CL_API_SUFFIX__VERSION_1_2;

 typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireDX9MediaSurfacesKHR_fn)(
--- a/src/3rdparty/CL/cl_gl_ext.h
+++ b/src/3rdparty/CL/cl_gl_ext.h
@@ -35,7 +35,7 @@ extern "C" {

 #include <CL/cl_gl.h>

-/* 
+/*
 *  cl_khr_gl_event extension
 */
 #define CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR     0x200D
--- a/src/3rdparty/adl/adl_defines.h
+++ b/src/3rdparty/adl/adl_defines.h
--- a/src/3rdparty/adl/adl_sdk.h
+++ b/src/3rdparty/adl/adl_sdk.h
@@ -0,0 +1,44 @@
+//
+// Copyright (c) 2016 Advanced Micro Devices, Inc. All rights reserved.
+//
+// MIT LICENSE:
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+/// \file adl_sdk.h
+/// \brief Contains the definition of the Memory Allocation Callback.\n <b>Included in ADL SDK</b>
+///
+/// \n\n
+/// This file contains the definition of the Memory Allocation Callback.\n
+/// It also includes definitions of the respective structures and constants.\n
+/// <b> This is the only header file to be included in a C/C++ project using ADL </b>
+
+#ifndef ADL_SDK_H_
+#define ADL_SDK_H_
+
+#include "adl_structures.h"
+
+#if defined (LINUX)
+#define __stdcall
+#endif /* (LINUX) */
+
+/// Memory Allocation Call back
+typedef void* ( __stdcall *ADL_MAIN_MALLOC_CALLBACK )( int );
+
+
+#endif /* ADL_SDK_H_ */
--- a/src/3rdparty/adl/adl_structures.h
+++ b/src/3rdparty/adl/adl_structures.h
--- a/src/3rdparty/argon2/CMakeLists.txt
+++ b/src/3rdparty/argon2/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.12)

 project(argon2 C)
 set(CMAKE_C_STANDARD 99)
@@ -17,7 +17,7 @@ set(ARGON2_SOURCES

 set(ARGON2_X86_64_ENABLED ON)
 set(ARGON2_X86_64_LIBS    argon2-sse2 argon2-ssse3 argon2-xop argon2-avx2 argon2-avx512f)
-set(ARGON2_X86_64_SOURCES arch/x86_64/lib/argon2-arch.c arch/x86_64/lib/cpu-flags.c)
+set(ARGON2_X86_64_SOURCES arch/x86_64/lib/argon2-arch.c)

 if (CMAKE_C_COMPILER_ID MATCHES MSVC)
    function(add_feature_impl FEATURE MSVC_FLAG DEF)
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-arch.c
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-arch.c
@@ -4,7 +4,6 @@

 #include "impl-select.h"

-#include "cpu-flags.h"
 #include "argon2-sse2.h"
 #include "argon2-ssse3.h"
 #include "argon2-xop.h"
@@ -26,16 +25,14 @@ void fill_segment_default(const argon2_instance_t *instance,
 void argon2_get_impl_list(argon2_impl_list *list)
 {
    static const argon2_impl IMPLS[] = {
-        { "x86_64",     NULL,           fill_segment_default },
-        { "SSE2",       check_sse2,     fill_segment_sse2 },
-        { "SSSE3",      check_ssse3,    fill_segment_ssse3 },
-        { "XOP",        check_xop,      fill_segment_xop },
-        { "AVX2",       check_avx2,     fill_segment_avx2 },
-        { "AVX-512F",   check_avx512f,  fill_segment_avx512f },
+        { "x86_64",     NULL,                     fill_segment_default },
+        { "SSE2",       xmrig_ar2_check_sse2,     xmrig_ar2_fill_segment_sse2 },
+        { "SSSE3",      xmrig_ar2_check_ssse3,    xmrig_ar2_fill_segment_ssse3 },
+        { "XOP",        xmrig_ar2_check_xop,      xmrig_ar2_fill_segment_xop },
+        { "AVX2",       xmrig_ar2_check_avx2,     xmrig_ar2_fill_segment_avx2 },
+        { "AVX-512F",   xmrig_ar2_check_avx512f,  xmrig_ar2_fill_segment_avx512f },
    };

-    cpu_flags_get();
-
    list->count = sizeof(IMPLS) / sizeof(IMPLS[0]);
    list->entries = IMPLS;
 }
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.c
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.c
@@ -9,8 +9,6 @@
 #   include <intrin.h>
 #endif

-#include "cpu-flags.h"
-
 #define r16 (_mm256_setr_epi8( \
     2,  3,  4,  5,  6,  7,  0,  1, \
    10, 11, 12, 13, 14, 15,  8,  9, \
@@ -225,8 +223,7 @@ static void next_addresses(block *address_block, block *input_block)
    fill_block(zero2_block, address_block, address_block, 0);
 }

-void fill_segment_avx2(const argon2_instance_t *instance,
-                       argon2_position_t position)
+void xmrig_ar2_fill_segment_avx2(const argon2_instance_t *instance, argon2_position_t position)
 {
    block *ref_block = NULL, *curr_block = NULL;
    block address_block, input_block;
@@ -310,8 +307,7 @@ void fill_segment_avx2(const argon2_instance_t *instance,
         * lane.
         */
        position.index = i;
-        ref_index = index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF,
-                                ref_lane == position.lane);
+        ref_index = xmrig_ar2_index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF, ref_lane == position.lane);

        /* 2 Creating a new block */
        ref_block =
@@ -327,21 +323,13 @@ void fill_segment_avx2(const argon2_instance_t *instance,
    }
 }

-int check_avx2(void)
-{
-    return cpu_flags_have_avx2();
-}
+
+extern int cpu_flags_has_avx2(void);
+int xmrig_ar2_check_avx2(void) { return cpu_flags_has_avx2(); }

 #else

-void fill_segment_avx2(const argon2_instance_t *instance,
-                       argon2_position_t position)
-{
-}
-
-int check_avx2(void)
-{
-    return 0;
-}
+void xmrig_ar2_fill_segment_avx2(const argon2_instance_t *instance, argon2_position_t position) {}
+int xmrig_ar2_check_avx2(void) { return 0; }

 #endif
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.h
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.h
@@ -3,9 +3,7 @@

 #include "core.h"

-void fill_segment_avx2(const argon2_instance_t *instance,
-                       argon2_position_t position);
-
-int check_avx2(void);
+void xmrig_ar2_fill_segment_avx2(const argon2_instance_t *instance, argon2_position_t position);
+int xmrig_ar2_check_avx2(void);

 #endif // ARGON2_AVX2_H
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.c
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.c
@@ -10,8 +10,6 @@
 #   include <intrin.h>
 #endif

-#include "cpu-flags.h"
-
 #define ror64(x, n) _mm512_ror_epi64((x), (n))

 static __m512i f(__m512i x, __m512i y)
@@ -210,8 +208,7 @@ static void next_addresses(block *address_block, block *input_block)
    fill_block(zero2_block, address_block, address_block, 0);
 }

-void fill_segment_avx512f(const argon2_instance_t *instance,
-                          argon2_position_t position)
+void xmrig_ar2_fill_segment_avx512f(const argon2_instance_t *instance, argon2_position_t position)
 {
    block *ref_block = NULL, *curr_block = NULL;
    block address_block, input_block;
@@ -295,8 +292,7 @@ void fill_segment_avx512f(const argon2_instance_t *instance,
         * lane.
         */
        position.index = i;
-        ref_index = index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF,
-                                ref_lane == position.lane);
+        ref_index = xmrig_ar2_index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF, ref_lane == position.lane);

        /* 2 Creating a new block */
        ref_block =
@@ -312,21 +308,12 @@ void fill_segment_avx512f(const argon2_instance_t *instance,
    }
 }

-int check_avx512f(void)
-{
-    return cpu_flags_have_avx512f();
-}
+extern int cpu_flags_has_avx512f(void);
+int xmrig_ar2_check_avx512f(void) { return cpu_flags_has_avx512f(); }

 #else

-void fill_segment_avx512f(const argon2_instance_t *instance,
-                          argon2_position_t position)
-{
-}
-
-int check_avx512f(void)
-{
-    return 0;
-}
+void xmrig_ar2_fill_segment_avx512f(const argon2_instance_t *instance, argon2_position_t position) {}
+int xmrig_ar2_check_avx512f(void) { return 0; }

 #endif
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.h
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.h
@@ -3,9 +3,7 @@

 #include "core.h"

-void fill_segment_avx512f(const argon2_instance_t *instance,
-                          argon2_position_t position);
-
-int check_avx512f(void);
+void xmrig_ar2_fill_segment_avx512f(const argon2_instance_t *instance, argon2_position_t position);
+int xmrig_ar2_check_avx512f(void);

 #endif // ARGON2_AVX512F_H
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.c
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.c
@@ -7,8 +7,6 @@
 #   include <intrin.h>
 #endif

-#include "cpu-flags.h"
-
 #define ror64_16(x) \
    _mm_shufflehi_epi16( \
        _mm_shufflelo_epi16((x), _MM_SHUFFLE(0, 3, 2, 1)), \
@@ -102,27 +100,17 @@ static __m128i f(__m128i x, __m128i y)

 #include "argon2-template-128.h"

-void fill_segment_sse2(const argon2_instance_t *instance,
-                       argon2_position_t position)
+void xmrig_ar2_fill_segment_sse2(const argon2_instance_t *instance, argon2_position_t position)
 {
    fill_segment_128(instance, position);
 }

-int check_sse2(void)
-{
-    return cpu_flags_have_sse2();
-}
+extern int cpu_flags_has_sse2(void);
+int xmrig_ar2_check_sse2(void) { return cpu_flags_has_sse2(); }

 #else

-void fill_segment_sse2(const argon2_instance_t *instance,
-                       argon2_position_t position)
-{
-}
-
-int check_sse2(void)
-{
-    return 0;
-}
+void xmrig_ar2_fill_segment_sse2(const argon2_instance_t *instance, argon2_position_t position) {}
+int xmrig_ar2_check_sse2(void) { return 0; }

 #endif
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.h
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.h
@@ -3,9 +3,7 @@

 #include "core.h"

-void fill_segment_sse2(const argon2_instance_t *instance,
-                       argon2_position_t position);
-
-int check_sse2(void);
+void xmrig_ar2_fill_segment_sse2(const argon2_instance_t *instance, argon2_position_t position);
+int xmrig_ar2_check_sse2(void);

 #endif // ARGON2_SSE2_H
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.c
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.c
@@ -9,8 +9,6 @@
 #   include <intrin.h>
 #endif

-#include "cpu-flags.h"
-
 #define r16 (_mm_setr_epi8( \
     2,  3,  4,  5,  6,  7,  0,  1, \
    10, 11, 12, 13, 14, 15,  8,  9))
@@ -114,27 +112,17 @@ static __m128i f(__m128i x, __m128i y)

 #include "argon2-template-128.h"

-void fill_segment_ssse3(const argon2_instance_t *instance,
-                        argon2_position_t position)
+void xmrig_ar2_fill_segment_ssse3(const argon2_instance_t *instance, argon2_position_t position)
 {
    fill_segment_128(instance, position);
 }

-int check_ssse3(void)
-{
-    return cpu_flags_have_ssse3();
-}
+extern int cpu_flags_has_ssse3(void);
+int xmrig_ar2_check_ssse3(void) { return cpu_flags_has_ssse3(); }

 #else

-void fill_segment_ssse3(const argon2_instance_t *instance,
-                        argon2_position_t position)
-{
-}
-
-int check_ssse3(void)
-{
-    return 0;
-}
+void xmrig_ar2_fill_segment_ssse3(const argon2_instance_t *instance, argon2_position_t position) {}
+int xmrig_ar2_check_ssse3(void) { return 0; }

 #endif
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.h
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.h
@@ -3,9 +3,7 @@

 #include "core.h"

-void fill_segment_ssse3(const argon2_instance_t *instance,
-                        argon2_position_t position);
-
-int check_ssse3(void);
+void xmrig_ar2_fill_segment_ssse3(const argon2_instance_t *instance, argon2_position_t position);
+int xmrig_ar2_check_ssse3(void);

 #endif // ARGON2_SSSE3_H
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-template-128.h
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-template-128.h
@@ -150,8 +150,7 @@ static void fill_segment_128(const argon2_instance_t *instance,
         * lane.
         */
        position.index = i;
-        ref_index = index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF,
-                                ref_lane == position.lane);
+        ref_index = xmrig_ar2_index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF, ref_lane == position.lane);

        /* 2 Creating a new block */
        ref_block =
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.c
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.c
@@ -9,8 +9,6 @@
 #   include <intrin.h>
 #endif

-#include "cpu-flags.h"
-
 #define ror64(x, c) _mm_roti_epi64((x), -(c))

 static __m128i f(__m128i x, __m128i y)
@@ -102,27 +100,17 @@ static __m128i f(__m128i x, __m128i y)

 #include "argon2-template-128.h"

-void fill_segment_xop(const argon2_instance_t *instance,
-                      argon2_position_t position)
+void xmrig_ar2_fill_segment_xop(const argon2_instance_t *instance, argon2_position_t position)
 {
    fill_segment_128(instance, position);
 }

-int check_xop(void)
-{
-    return cpu_flags_have_xop();
-}
+extern int cpu_flags_has_xop(void);
+int xmrig_ar2_check_xop(void) { return cpu_flags_has_xop(); }

 #else

-void fill_segment_xop(const argon2_instance_t *instance,
-                      argon2_position_t position)
-{
-}
-
-int check_xop(void)
-{
-    return 0;
-}
+void xmrig_ar2_fill_segment_xop(const argon2_instance_t *instance, argon2_position_t position) {}
+int xmrig_ar2_check_xop(void) { return 0; }

 #endif
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.h
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.h
@@ -3,9 +3,7 @@

 #include "core.h"

-void fill_segment_xop(const argon2_instance_t *instance,
-                      argon2_position_t position);
-
-int check_xop(void);
+void xmrig_ar2_fill_segment_xop(const argon2_instance_t *instance, argon2_position_t position);
+int xmrig_ar2_check_xop(void);

 #endif // ARGON2_XOP_H
--- a/src/3rdparty/argon2/arch/x86_64/lib/cpu-flags.c
+++ b/src/3rdparty/argon2/arch/x86_64/lib/cpu-flags.c
@@ -1,129 +0,0 @@
-#include <stdbool.h>
-#include <stdint.h>
-
-
-#include "cpu-flags.h"
-
-#include <stdio.h>
-
-#ifdef _MSC_VER
-#   include <intrin.h>
-#else
-#   include <cpuid.h>
-#endif
-
-#ifndef bit_OSXSAVE
-#   define bit_OSXSAVE (1 << 27)
-#endif
-
-#ifndef bit_SSE2
-#   define bit_SSE2 (1 << 26)
-#endif
-
-#ifndef bit_SSSE3
-#   define bit_SSSE3 (1 << 9)
-#endif
-
-#ifndef bit_AVX2
-#   define bit_AVX2 (1 << 5)
-#endif
-
-#ifndef bit_AVX512F
-#   define bit_AVX512F (1 << 16)
-#endif
-
-#ifndef bit_XOP
-#   define bit_XOP (1 << 11)
-#endif
-
-#define PROCESSOR_INFO    (1)
-#define EXTENDED_FEATURES (7)
-
-#define EAX_Reg  (0)
-#define EBX_Reg  (1)
-#define ECX_Reg  (2)
-#define EDX_Reg  (3)
-
-
-enum {
-    X86_64_FEATURE_SSE2     = (1 << 0),
-    X86_64_FEATURE_SSSE3    = (1 << 1),
-    X86_64_FEATURE_XOP      = (1 << 2),
-    X86_64_FEATURE_AVX2     = (1 << 3),
-    X86_64_FEATURE_AVX512F  = (1 << 4),
-};
-
-static unsigned int cpu_flags;
-
-
-static inline void cpuid(uint32_t level, int32_t output[4])
-{
-#   ifdef _MSC_VER
-    __cpuid(output, (int) level);
-#   else
-    __cpuid_count(level, 0, output[0], output[1], output[2], output[3]);
-#   endif
-}
-
-
-static bool has_feature(uint32_t level, uint32_t reg, int32_t bit)
-{
-    int32_t cpu_info[4] = { 0 };
-    cpuid(level, cpu_info);
-
-    return (cpu_info[reg] & bit) != 0;
-}
-
-
-void cpu_flags_get(void)
-{
-    if (has_feature(PROCESSOR_INFO, EDX_Reg, bit_SSE2)) {
-        cpu_flags |= X86_64_FEATURE_SSE2;
-    }
-
-    if (has_feature(PROCESSOR_INFO, ECX_Reg, bit_SSSE3)) {
-        cpu_flags |= X86_64_FEATURE_SSSE3;
-    }
-
-    if (!has_feature(PROCESSOR_INFO, ECX_Reg, bit_OSXSAVE)) {
-        return;
-    }
-
-    if (has_feature(EXTENDED_FEATURES, EBX_Reg, bit_AVX2)) {
-        cpu_flags |= X86_64_FEATURE_AVX2;
-    }
-
-    if (has_feature(EXTENDED_FEATURES, EBX_Reg, bit_AVX512F)) {
-        cpu_flags |= X86_64_FEATURE_AVX512F;
-    }
-
-    if (has_feature(0x80000001, ECX_Reg, bit_XOP)) {
-        cpu_flags |= X86_64_FEATURE_XOP;
-    }
-}
-
-int cpu_flags_have_sse2(void)
-{
-    return cpu_flags & X86_64_FEATURE_SSE2;
-}
-
-int cpu_flags_have_ssse3(void)
-{
-    return cpu_flags & X86_64_FEATURE_SSSE3;
-}
-
-int cpu_flags_have_xop(void)
-{
-    return cpu_flags & X86_64_FEATURE_XOP;
-}
-
-int cpu_flags_have_avx2(void)
-{
-    return cpu_flags & X86_64_FEATURE_AVX2;
-}
-
-int cpu_flags_have_avx512f(void)
-{
-    return cpu_flags & X86_64_FEATURE_AVX512F;
-}
-
--- a/src/3rdparty/argon2/arch/x86_64/lib/cpu-flags.h
+++ b/src/3rdparty/argon2/arch/x86_64/lib/cpu-flags.h
@@ -1,12 +0,0 @@
-#ifndef ARGON2_CPU_FLAGS_H
-#define ARGON2_CPU_FLAGS_H
-
-void cpu_flags_get(void);
-
-int cpu_flags_have_sse2(void);
-int cpu_flags_have_ssse3(void);
-int cpu_flags_have_xop(void);
-int cpu_flags_have_avx2(void);
-int cpu_flags_have_avx512f(void);
-
-#endif // ARGON2_CPU_FLAGS_H
--- a/src/3rdparty/argon2/lib/argon2-template-64.h
+++ b/src/3rdparty/argon2/lib/argon2-template-64.h
@@ -174,8 +174,7 @@ static void fill_segment_64(const argon2_instance_t *instance,
         * lane.
         */
        position.index = i;
-        ref_index = index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF,
-                                ref_lane == position.lane);
+        ref_index = xmrig_ar2_index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF, ref_lane == position.lane);

        /* 2 Creating a new block */
        ref_block =
--- a/src/3rdparty/argon2/lib/argon2.c
+++ b/src/3rdparty/argon2/lib/argon2.c
@@ -57,7 +57,7 @@ size_t argon2_memory_size(uint32_t m_cost, uint32_t parallelism) {
 int argon2_ctx_mem(argon2_context *context, argon2_type type, void *memory,
                   size_t memory_size) {
    /* 1. Validate all inputs */
-    int result = validate_inputs(context);
+    int result = xmrig_ar2_validate_inputs(context);
    uint32_t memory_blocks, segment_length;
    argon2_instance_t instance;

@@ -98,20 +98,20 @@ int argon2_ctx_mem(argon2_context *context, argon2_type type, void *memory,
    /* 3. Initialization: Hashing inputs, allocating memory, filling first
     * blocks
     */
-    result = initialize(&instance, context);
+    result = xmrig_ar2_initialize(&instance, context);

    if (ARGON2_OK != result) {
        return result;
    }

    /* 4. Filling memory */
-    result = fill_memory_blocks(&instance);
+    result = xmrig_ar2_fill_memory_blocks(&instance);

    if (ARGON2_OK != result) {
        return result;
    }
    /* 5. Finalization */
-    finalize(context, &instance);
+    xmrig_ar2_finalize(context, &instance);

    return ARGON2_OK;
 }
@@ -174,7 +174,7 @@ int argon2_hash(const uint32_t t_cost, const uint32_t m_cost,
    result = argon2_ctx(&context, type);

    if (result != ARGON2_OK) {
-        clear_internal_memory(out, hashlen);
+        xmrig_ar2_clear_internal_memory(out, hashlen);
        free(out);
        return result;
    }
@@ -187,13 +187,13 @@ int argon2_hash(const uint32_t t_cost, const uint32_t m_cost,
    /* if encoding requested, write it */
    if (encoded && encodedlen) {
        if (encode_string(encoded, encodedlen, &context, type) != ARGON2_OK) {
-            clear_internal_memory(out, hashlen); /* wipe buffers if error */
-            clear_internal_memory(encoded, encodedlen);
+            xmrig_ar2_clear_internal_memory(out, hashlen); /* wipe buffers if error */
+            xmrig_ar2_clear_internal_memory(encoded, encodedlen);
            free(out);
            return ARGON2_ENCODING_FAIL;
        }
    }
-    clear_internal_memory(out, hashlen);
+    xmrig_ar2_clear_internal_memory(out, hashlen);
    free(out);

    return ARGON2_OK;
--- a/src/3rdparty/argon2/lib/blake2/blake2.c
+++ b/src/3rdparty/argon2/lib/blake2/blake2.c
@@ -128,14 +128,14 @@ static void blake2b_init_state(blake2b_state *S)
    S->buflen = 0;
 }

-void blake2b_init(blake2b_state *S, size_t outlen)
+void xmrig_ar2_blake2b_init(blake2b_state *S, size_t outlen)
 {
    blake2b_init_state(S);
    /* XOR initial state with param block: */
    S->h[0] ^= (uint64_t)outlen | (UINT64_C(1) << 16) | (UINT64_C(1) << 24);
 }

-void blake2b_update(blake2b_state *S, const void *in, size_t inlen)
+void xmrig_ar2_blake2b_update(blake2b_state *S, const void *in, size_t inlen)
 {
    const uint8_t *pin = (const uint8_t *)in;

@@ -160,7 +160,7 @@ void blake2b_update(blake2b_state *S, const void *in, size_t inlen)
    S->buflen += inlen;
 }

-void blake2b_final(blake2b_state *S, void *out, size_t outlen)
+void xmrig_ar2_blake2b_final(blake2b_state *S, void *out, size_t outlen)
 {
    uint8_t buffer[BLAKE2B_OUTBYTES] = {0};
    unsigned int i;
@@ -174,12 +174,12 @@ void blake2b_final(blake2b_state *S, void *out, size_t outlen)
    }

    memcpy(out, buffer, outlen);
-    clear_internal_memory(buffer, sizeof(buffer));
-    clear_internal_memory(S->buf, sizeof(S->buf));
-    clear_internal_memory(S->h, sizeof(S->h));
+    xmrig_ar2_clear_internal_memory(buffer, sizeof(buffer));
+    xmrig_ar2_clear_internal_memory(S->buf, sizeof(S->buf));
+    xmrig_ar2_clear_internal_memory(S->h, sizeof(S->h));
 }

-void blake2b_long(void *out, size_t outlen, const void *in, size_t inlen)
+void xmrig_ar2_blake2b_long(void *out, size_t outlen, const void *in, size_t inlen)
 {
    uint8_t *pout = (uint8_t *)out;
    blake2b_state blake_state;
@@ -187,39 +187,39 @@ void blake2b_long(void *out, size_t outlen, const void *in, size_t inlen)

    store32(outlen_bytes, (uint32_t)outlen);
    if (outlen <= BLAKE2B_OUTBYTES) {
-        blake2b_init(&blake_state, outlen);
-        blake2b_update(&blake_state, outlen_bytes, sizeof(outlen_bytes));
-        blake2b_update(&blake_state, in, inlen);
-        blake2b_final(&blake_state, pout, outlen);
+        xmrig_ar2_blake2b_init(&blake_state, outlen);
+        xmrig_ar2_blake2b_update(&blake_state, outlen_bytes, sizeof(outlen_bytes));
+        xmrig_ar2_blake2b_update(&blake_state, in, inlen);
+        xmrig_ar2_blake2b_final(&blake_state, pout, outlen);
    } else {
        uint32_t toproduce;
        uint8_t out_buffer[BLAKE2B_OUTBYTES];

-        blake2b_init(&blake_state, BLAKE2B_OUTBYTES);
-        blake2b_update(&blake_state, outlen_bytes, sizeof(outlen_bytes));
-        blake2b_update(&blake_state, in, inlen);
-        blake2b_final(&blake_state, out_buffer, BLAKE2B_OUTBYTES);
+        xmrig_ar2_blake2b_init(&blake_state, BLAKE2B_OUTBYTES);
+        xmrig_ar2_blake2b_update(&blake_state, outlen_bytes, sizeof(outlen_bytes));
+        xmrig_ar2_blake2b_update(&blake_state, in, inlen);
+        xmrig_ar2_blake2b_final(&blake_state, out_buffer, BLAKE2B_OUTBYTES);

        memcpy(pout, out_buffer, BLAKE2B_OUTBYTES / 2);
        pout += BLAKE2B_OUTBYTES / 2;
        toproduce = (uint32_t)outlen - BLAKE2B_OUTBYTES / 2;

        while (toproduce > BLAKE2B_OUTBYTES) {
-            blake2b_init(&blake_state, BLAKE2B_OUTBYTES);
-            blake2b_update(&blake_state, out_buffer, BLAKE2B_OUTBYTES);
-            blake2b_final(&blake_state, out_buffer, BLAKE2B_OUTBYTES);
+            xmrig_ar2_blake2b_init(&blake_state, BLAKE2B_OUTBYTES);
+            xmrig_ar2_blake2b_update(&blake_state, out_buffer, BLAKE2B_OUTBYTES);
+            xmrig_ar2_blake2b_final(&blake_state, out_buffer, BLAKE2B_OUTBYTES);

            memcpy(pout, out_buffer, BLAKE2B_OUTBYTES / 2);
            pout += BLAKE2B_OUTBYTES / 2;
            toproduce -= BLAKE2B_OUTBYTES / 2;
        }

-        blake2b_init(&blake_state, toproduce);
-        blake2b_update(&blake_state, out_buffer, BLAKE2B_OUTBYTES);
-        blake2b_final(&blake_state, out_buffer, toproduce);
+        xmrig_ar2_blake2b_init(&blake_state, toproduce);
+        xmrig_ar2_blake2b_update(&blake_state, out_buffer, BLAKE2B_OUTBYTES);
+        xmrig_ar2_blake2b_final(&blake_state, out_buffer, toproduce);

        memcpy(pout, out_buffer, toproduce);

-        clear_internal_memory(out_buffer, sizeof(out_buffer));
+        xmrig_ar2_clear_internal_memory(out_buffer, sizeof(out_buffer));
    }
 }
--- a/src/3rdparty/argon2/lib/blake2/blake2.h
+++ b/src/3rdparty/argon2/lib/blake2/blake2.h
@@ -20,11 +20,11 @@ typedef struct __blake2b_state {
 } blake2b_state;

 /* Streaming API */
-void blake2b_init(blake2b_state *S, size_t outlen);
-void blake2b_update(blake2b_state *S, const void *in, size_t inlen);
-void blake2b_final(blake2b_state *S, void *out, size_t outlen);
+void xmrig_ar2_blake2b_init(blake2b_state *S, size_t outlen);
+void xmrig_ar2_blake2b_update(blake2b_state *S, const void *in, size_t inlen);
+void xmrig_ar2_blake2b_final(blake2b_state *S, void *out, size_t outlen);

-void blake2b_long(void *out, size_t outlen, const void *in, size_t inlen);
+void xmrig_ar2_blake2b_long(void *out, size_t outlen, const void *in, size_t inlen);

 #endif // ARGON2_BLAKE2_H

--- a/src/3rdparty/argon2/lib/core.c
+++ b/src/3rdparty/argon2/lib/core.c
@@ -77,8 +77,7 @@ static void store_block(void *output, const block *src) {

 /***************Memory functions*****************/

-int allocate_memory(const argon2_context *context,
-                    argon2_instance_t *instance) {
+int xmrig_ar2_allocate_memory(const argon2_context *context, argon2_instance_t *instance) {
    size_t blocks = instance->memory_blocks;
    size_t memory_size = blocks * ARGON2_BLOCK_SIZE;

@@ -107,11 +106,10 @@ int allocate_memory(const argon2_context *context,
    return ARGON2_OK;
 }

-void free_memory(const argon2_context *context,
-                 const argon2_instance_t *instance) {
+void xmrig_ar2_free_memory(const argon2_context *context, const argon2_instance_t *instance) {
    size_t memory_size = instance->memory_blocks * ARGON2_BLOCK_SIZE;

-    clear_internal_memory(instance->memory, memory_size);
+    xmrig_ar2_clear_internal_memory(instance->memory, memory_size);

    if (instance->keep_memory) {
        /* user-supplied memory -- do not free */
@@ -125,7 +123,7 @@ void free_memory(const argon2_context *context,
    }
 }

-void NOT_OPTIMIZED secure_wipe_memory(void *v, size_t n) {
+void NOT_OPTIMIZED xmrig_ar2_secure_wipe_memory(void *v, size_t n) {
 #if defined(_MSC_VER) && VC_GE_2005(_MSC_VER)
    SecureZeroMemory(v, n);
 #elif defined memset_s
@@ -140,14 +138,14 @@ void NOT_OPTIMIZED secure_wipe_memory(void *v, size_t n) {

 /* Memory clear flag defaults to true. */
 int FLAG_clear_internal_memory = 0;
-void clear_internal_memory(void *v, size_t n) {
+void xmrig_ar2_clear_internal_memory(void *v, size_t n) {
    if (FLAG_clear_internal_memory && v) {
-        secure_wipe_memory(v, n);
+        xmrig_ar2_secure_wipe_memory(v, n);
    }
 }

-void finalize(const argon2_context *context, argon2_instance_t *instance) {
-    if (context != NULL && instance != NULL) {
+void xmrig_ar2_finalize(const argon2_context *context, argon2_instance_t *instance) {
+    if (context != NULL && instance != NULL && context->out != NULL) {
        block blockhash;
        uint32_t l;

@@ -164,24 +162,21 @@ void finalize(const argon2_context *context, argon2_instance_t *instance) {
        {
            uint8_t blockhash_bytes[ARGON2_BLOCK_SIZE];
            store_block(blockhash_bytes, &blockhash);
-            blake2b_long(context->out, context->outlen, blockhash_bytes,
-                         ARGON2_BLOCK_SIZE);
+            xmrig_ar2_blake2b_long(context->out, context->outlen, blockhash_bytes, ARGON2_BLOCK_SIZE);
            /* clear blockhash and blockhash_bytes */
-            clear_internal_memory(blockhash.v, ARGON2_BLOCK_SIZE);
-            clear_internal_memory(blockhash_bytes, ARGON2_BLOCK_SIZE);
+            xmrig_ar2_clear_internal_memory(blockhash.v, ARGON2_BLOCK_SIZE);
+            xmrig_ar2_clear_internal_memory(blockhash_bytes, ARGON2_BLOCK_SIZE);
        }

        if (instance->print_internals) {
            print_tag(context->out, context->outlen);
        }

-        free_memory(context, instance);
+        xmrig_ar2_free_memory(context, instance);
    }
 }

-uint32_t index_alpha(const argon2_instance_t *instance,
-                     const argon2_position_t *position, uint32_t pseudo_rand,
-                     int same_lane) {
+uint32_t xmrig_ar2_index_alpha(const argon2_instance_t *instance, const argon2_position_t *position, uint32_t pseudo_rand, int same_lane) {
    /*
     * Pass 0:
     *      This lane : all already finished segments plus already constructed
@@ -257,7 +252,7 @@ static int fill_memory_blocks_st(argon2_instance_t *instance) {
        for (s = 0; s < ARGON2_SYNC_POINTS; ++s) {
            for (l = 0; l < instance->lanes; ++l) {
                argon2_position_t position = { r, l, (uint8_t)s, 0 };
-                fill_segment(instance, position);
+                xmrig_ar2_fill_segment(instance, position);
            }
        }

@@ -268,7 +263,7 @@ static int fill_memory_blocks_st(argon2_instance_t *instance) {
    return ARGON2_OK;
 }

-int fill_memory_blocks(argon2_instance_t *instance) {
+int xmrig_ar2_fill_memory_blocks(argon2_instance_t *instance) {
    if (instance == NULL || instance->lanes == 0) {
        return ARGON2_INCORRECT_PARAMETER;
    }
@@ -276,19 +271,19 @@ int fill_memory_blocks(argon2_instance_t *instance) {
    return fill_memory_blocks_st(instance);
 }

-int validate_inputs(const argon2_context *context) {
+int xmrig_ar2_validate_inputs(const argon2_context *context) {
    if (NULL == context) {
        return ARGON2_INCORRECT_PARAMETER;
    }

-    if (NULL == context->out) {
-        return ARGON2_OUTPUT_PTR_NULL;
-    }
+    //if (NULL == context->out) {
+    //    return ARGON2_OUTPUT_PTR_NULL;
+    //}

    /* Validate output length */
-    if (ARGON2_MIN_OUTLEN > context->outlen) {
-        return ARGON2_OUTPUT_TOO_SHORT;
-    }
+    //if (ARGON2_MIN_OUTLEN > context->outlen) {
+    //    return ARGON2_OUTPUT_TOO_SHORT;
+    //}

    if (ARGON2_MAX_OUTLEN < context->outlen) {
        return ARGON2_OUTPUT_TOO_LONG;
@@ -403,7 +398,7 @@ int validate_inputs(const argon2_context *context) {
    return ARGON2_OK;
 }

-void fill_first_blocks(uint8_t *blockhash, const argon2_instance_t *instance) {
+void xmrig_ar2_fill_first_blocks(uint8_t *blockhash, const argon2_instance_t *instance) {
    uint32_t l;
    /* Make the first and second block in each lane as G(H0||0||i) or
       G(H0||1||i) */
@@ -412,21 +407,17 @@ void fill_first_blocks(uint8_t *blockhash, const argon2_instance_t *instance) {

        store32(blockhash + ARGON2_PREHASH_DIGEST_LENGTH, 0);
        store32(blockhash + ARGON2_PREHASH_DIGEST_LENGTH + 4, l);
-        blake2b_long(blockhash_bytes, ARGON2_BLOCK_SIZE, blockhash,
-                     ARGON2_PREHASH_SEED_LENGTH);
-        load_block(&instance->memory[l * instance->lane_length + 0],
-                   blockhash_bytes);
+        xmrig_ar2_blake2b_long(blockhash_bytes, ARGON2_BLOCK_SIZE, blockhash, ARGON2_PREHASH_SEED_LENGTH);
+        load_block(&instance->memory[l * instance->lane_length + 0], blockhash_bytes);

        store32(blockhash + ARGON2_PREHASH_DIGEST_LENGTH, 1);
-        blake2b_long(blockhash_bytes, ARGON2_BLOCK_SIZE, blockhash,
-                     ARGON2_PREHASH_SEED_LENGTH);
-        load_block(&instance->memory[l * instance->lane_length + 1],
-                   blockhash_bytes);
+        xmrig_ar2_blake2b_long(blockhash_bytes, ARGON2_BLOCK_SIZE, blockhash, ARGON2_PREHASH_SEED_LENGTH);
+        load_block(&instance->memory[l * instance->lane_length + 1], blockhash_bytes);
    }
-    clear_internal_memory(blockhash_bytes, ARGON2_BLOCK_SIZE);
+    xmrig_ar2_clear_internal_memory(blockhash_bytes, ARGON2_BLOCK_SIZE);
 }

-void initial_hash(uint8_t *blockhash, argon2_context *context,
+void xmrig_ar2_initial_hash(uint8_t *blockhash, argon2_context *context,
                  argon2_type type) {
    blake2b_state BlakeHash;
    uint8_t value[sizeof(uint32_t)];
@@ -435,72 +426,70 @@ void initial_hash(uint8_t *blockhash, argon2_context *context,
        return;
    }

-    blake2b_init(&BlakeHash, ARGON2_PREHASH_DIGEST_LENGTH);
+    xmrig_ar2_blake2b_init(&BlakeHash, ARGON2_PREHASH_DIGEST_LENGTH);

    store32(&value, context->lanes);
-    blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));
+    xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));

    store32(&value, context->outlen);
-    blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));
+    xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));

    store32(&value, context->m_cost);
-    blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));
+    xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));

    store32(&value, context->t_cost);
-    blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));
+    xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));

    store32(&value, context->version);
-    blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));
+    xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));

    store32(&value, (uint32_t)type);
-    blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));
+    xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));

    store32(&value, context->pwdlen);
-    blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));
+    xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));

    if (context->pwd != NULL) {
-        blake2b_update(&BlakeHash, (const uint8_t *)context->pwd,
+        xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)context->pwd,
                       context->pwdlen);

        if (context->flags & ARGON2_FLAG_CLEAR_PASSWORD) {
-            secure_wipe_memory(context->pwd, context->pwdlen);
+            xmrig_ar2_secure_wipe_memory(context->pwd, context->pwdlen);
            context->pwdlen = 0;
        }
    }

    store32(&value, context->saltlen);
-    blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));
+    xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));

    if (context->salt != NULL) {
-        blake2b_update(&BlakeHash, (const uint8_t *)context->salt,
+        xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)context->salt,
                       context->saltlen);
    }

    store32(&value, context->secretlen);
-    blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));
+    xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));

    if (context->secret != NULL) {
-        blake2b_update(&BlakeHash, (const uint8_t *)context->secret,
-                       context->secretlen);
+        xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)context->secret, context->secretlen);

        if (context->flags & ARGON2_FLAG_CLEAR_SECRET) {
-            secure_wipe_memory(context->secret, context->secretlen);
+            xmrig_ar2_secure_wipe_memory(context->secret, context->secretlen);
            context->secretlen = 0;
        }
    }

    store32(&value, context->adlen);
-    blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));
+    xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value));

    if (context->ad != NULL) {
-        blake2b_update(&BlakeHash, (const uint8_t *)context->ad,
-                       context->adlen);
+        xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)context->ad, context->adlen);
    }

-    blake2b_final(&BlakeHash, blockhash, ARGON2_PREHASH_DIGEST_LENGTH);
+    xmrig_ar2_blake2b_final(&BlakeHash, blockhash, ARGON2_PREHASH_DIGEST_LENGTH);
 }

-int initialize(argon2_instance_t *instance, argon2_context *context) {
+int xmrig_ar2_initialize(argon2_instance_t *instance, argon2_context *context) {
    uint8_t blockhash[ARGON2_PREHASH_SEED_LENGTH];
    int result = ARGON2_OK;

@@ -510,7 +499,7 @@ int initialize(argon2_instance_t *instance, argon2_context *context) {

    /* 1. Memory allocation */

-    result = allocate_memory(context, instance);
+    result = xmrig_ar2_allocate_memory(context, instance);
    if (result != ARGON2_OK) {
        return result;
    }
@@ -519,11 +508,9 @@ int initialize(argon2_instance_t *instance, argon2_context *context) {
    /* H_0 + 8 extra bytes to produce the first blocks */
    /* uint8_t blockhash[ARGON2_PREHASH_SEED_LENGTH]; */
    /* Hashing all inputs */
-    initial_hash(blockhash, context, instance->type);
+    xmrig_ar2_initial_hash(blockhash, context, instance->type);
    /* Zeroing 8 extra bytes */
-    clear_internal_memory(blockhash + ARGON2_PREHASH_DIGEST_LENGTH,
-                          ARGON2_PREHASH_SEED_LENGTH -
-                              ARGON2_PREHASH_DIGEST_LENGTH);
+    xmrig_ar2_clear_internal_memory(blockhash + ARGON2_PREHASH_DIGEST_LENGTH, ARGON2_PREHASH_SEED_LENGTH - ARGON2_PREHASH_DIGEST_LENGTH);

    if (instance->print_internals) {
        initial_kat(blockhash, context, instance->type);
@@ -531,9 +518,9 @@ int initialize(argon2_instance_t *instance, argon2_context *context) {

    /* 3. Creating first blocks, we always have at least two blocks in a slice
     */
-    fill_first_blocks(blockhash, instance);
+    xmrig_ar2_fill_first_blocks(blockhash, instance);
    /* Clearing the hash */
-    clear_internal_memory(blockhash, ARGON2_PREHASH_SEED_LENGTH);
+    xmrig_ar2_clear_internal_memory(blockhash, ARGON2_PREHASH_SEED_LENGTH);

    return ARGON2_OK;
 }
--- a/src/3rdparty/argon2/lib/core.h
+++ b/src/3rdparty/argon2/lib/core.h
@@ -110,8 +110,7 @@ typedef struct Argon2_thread_data {
 * @param instance the Argon2 instance
 * @return ARGON2_OK if memory is allocated successfully
 */
-int allocate_memory(const argon2_context *context,
-                    argon2_instance_t *instance);
+int xmrig_ar2_allocate_memory(const argon2_context *context, argon2_instance_t *instance);

 /*
 * Frees memory at the given pointer, uses the appropriate deallocator as
@@ -119,22 +118,21 @@ int allocate_memory(const argon2_context *context,
 * @param context argon2_context which specifies the deallocator
 * @param instance the Argon2 instance
 */
-void free_memory(const argon2_context *context,
-                 const argon2_instance_t *instance);
+void xmrig_ar2_free_memory(const argon2_context *context, const argon2_instance_t *instance);

 /* Function that securely cleans the memory. This ignores any flags set
 * regarding clearing memory. Usually one just calls clear_internal_memory.
 * @param mem Pointer to the memory
 * @param s Memory size in bytes
 */
-void secure_wipe_memory(void *v, size_t n);
+void xmrig_ar2_secure_wipe_memory(void *v, size_t n);

 /* Function that securely clears the memory if FLAG_clear_internal_memory is
 * set. If the flag isn't set, this function does nothing.
 * @param mem Pointer to the memory
 * @param s Memory size in bytes
 */
-ARGON2_PUBLIC void clear_internal_memory(void *v, size_t n);
+ARGON2_PUBLIC void xmrig_ar2_clear_internal_memory(void *v, size_t n);

 /*
 * Computes absolute position of reference block in the lane following a skewed
@@ -146,9 +144,7 @@ ARGON2_PUBLIC void clear_internal_memory(void *v, size_t n);
 * If so we can reference the current segment
 * @pre All pointers must be valid
 */
-uint32_t index_alpha(const argon2_instance_t *instance,
-                     const argon2_position_t *position, uint32_t pseudo_rand,
-                     int same_lane);
+uint32_t xmrig_ar2_index_alpha(const argon2_instance_t *instance, const argon2_position_t *position, uint32_t pseudo_rand, int same_lane);

 /*
 * Function that validates all inputs against predefined restrictions and return
@@ -157,7 +153,7 @@ uint32_t index_alpha(const argon2_instance_t *instance,
 * @return ARGON2_OK if everything is all right, otherwise one of error codes
 * (all defined in <argon2.h>
 */
-int validate_inputs(const argon2_context *context);
+int xmrig_ar2_validate_inputs(const argon2_context *context);

 /*
 * Hashes all the inputs into @a blockhash[PREHASH_DIGEST_LENGTH], clears
@@ -169,8 +165,7 @@ int validate_inputs(const argon2_context *context);
 * @pre    @a blockhash must have at least @a PREHASH_DIGEST_LENGTH bytes
 * allocated
 */
-void initial_hash(uint8_t *blockhash, argon2_context *context,
-                  argon2_type type);
+void xmrig_ar2_initial_hash(uint8_t *blockhash, argon2_context *context, argon2_type type);

 /*
 * Function creates first 2 blocks per lane
@@ -178,7 +173,7 @@ void initial_hash(uint8_t *blockhash, argon2_context *context,
 * @param blockhash Pointer to the pre-hashing digest
 * @pre blockhash must point to @a PREHASH_SEED_LENGTH allocated values
 */
-void fill_first_blocks(uint8_t *blockhash, const argon2_instance_t *instance);
+void xmrig_ar2_fill_first_blocks(uint8_t *blockhash, const argon2_instance_t *instance);

 /*
 * Function allocates memory, hashes the inputs with Blake,  and creates first
@@ -190,7 +185,7 @@ void fill_first_blocks(uint8_t *blockhash, const argon2_instance_t *instance);
 * @return Zero if successful, -1 if memory failed to allocate. @context->state
 * will be modified if successful.
 */
-int initialize(argon2_instance_t *instance, argon2_context *context);
+int xmrig_ar2_initialize(argon2_instance_t *instance, argon2_context *context);

 /*
 * XORing the last block of each lane, hashing it, making the tag. Deallocates
@@ -203,7 +198,7 @@ int initialize(argon2_instance_t *instance, argon2_context *context);
 * @pre if context->free_cbk is not NULL, it should point to a function that
 * deallocates memory
 */
-void finalize(const argon2_context *context, argon2_instance_t *instance);
+void xmrig_ar2_finalize(const argon2_context *context, argon2_instance_t *instance);

 /*
 * Function that fills the segment using previous segments also from other
@@ -212,8 +207,7 @@ void finalize(const argon2_context *context, argon2_instance_t *instance);
 * @param position Current position
 * @pre all block pointers must be valid
 */
-void fill_segment(const argon2_instance_t *instance,
-                  argon2_position_t position);
+void xmrig_ar2_fill_segment(const argon2_instance_t *instance, argon2_position_t position);

 /*
 * Function that fills the entire memory t_cost times based on the first two
@@ -221,6 +215,6 @@ void fill_segment(const argon2_instance_t *instance,
 * @param instance Pointer to the current instance
 * @return ARGON2_OK if successful, @context->state
 */
-int fill_memory_blocks(argon2_instance_t *instance);
+int xmrig_ar2_fill_memory_blocks(argon2_instance_t *instance);

 #endif
--- a/src/3rdparty/argon2/lib/encoding.c
+++ b/src/3rdparty/argon2/lib/encoding.c
@@ -323,7 +323,7 @@ int decode_string(argon2_context *ctx, const char *str, argon2_type type) {
    ctx->flags = ARGON2_DEFAULT_FLAGS;

    /* On return, must have valid context */
-    validation_result = validate_inputs(ctx);
+    validation_result = xmrig_ar2_validate_inputs(ctx);
    if (validation_result != ARGON2_OK) {
        return validation_result;
    }
@@ -371,7 +371,7 @@ int encode_string(char *dst, size_t dst_len, argon2_context *ctx,
    } while ((void)0, 0)

    const char* type_string = argon2_type2string(type, 0);
-    int validation_result = validate_inputs(ctx);
+    int validation_result = xmrig_ar2_validate_inputs(ctx);

    if (!type_string) {
        return ARGON2_ENCODING_FAIL;
--- a/src/3rdparty/argon2/lib/impl-select.c
+++ b/src/3rdparty/argon2/lib/impl-select.c
@@ -2,79 +2,81 @@
 #include <string.h>

 #include "impl-select.h"
-
 #include "3rdparty/argon2.h"

-#define BENCH_SAMPLES 1024
+
+extern uint64_t uv_hrtime(void);
+
+
+#define BENCH_SAMPLES 1024U
 #define BENCH_MEM_BLOCKS 512

-static argon2_impl selected_argon_impl = {
-    "default", NULL, fill_segment_default
-};
+
+#ifdef _MSC_VER
+#   define strcasecmp  _stricmp
+#endif
+
+
+static argon2_impl selected_argon_impl = { "default", NULL, fill_segment_default };
+

 /* the benchmark routine is not thread-safe, so we can use a global var here: */
 static block memory[BENCH_MEM_BLOCKS];

-static uint64_t benchmark_impl(const argon2_impl *impl) {
-    clock_t time;
-    unsigned int i;
-    uint64_t bench;
-    argon2_instance_t instance;
-    argon2_position_t pos;

+static uint64_t benchmark_impl(const argon2_impl *impl) {
    memset(memory, 0, sizeof(memory));

-    instance.version = ARGON2_VERSION_NUMBER;
-    instance.memory = memory;
-    instance.passes = 1;
-    instance.memory_blocks = BENCH_MEM_BLOCKS;
+    argon2_instance_t instance;
+    instance.version        = ARGON2_VERSION_NUMBER;
+    instance.memory         = memory;
+    instance.passes         = 1;
+    instance.memory_blocks  = BENCH_MEM_BLOCKS;
    instance.segment_length = BENCH_MEM_BLOCKS / ARGON2_SYNC_POINTS;
-    instance.lane_length = instance.segment_length * ARGON2_SYNC_POINTS;
-    instance.lanes = 1;
-    instance.threads = 1;
-    instance.type = Argon2_i;
+    instance.lane_length    = instance.segment_length * ARGON2_SYNC_POINTS;
+    instance.lanes          = 1;
+    instance.threads        = 1;
+    instance.type           = Argon2_id;

-    pos.lane = 0;
-    pos.pass = 0;
-    pos.slice = 0;
-    pos.index = 0;
+    argon2_position_t pos;
+    pos.lane    = 0;
+    pos.pass    = 0;
+    pos.slice   = 0;
+    pos.index   = 0;

    /* warm-up cache: */
    impl->fill_segment(&instance, pos);

    /* OK, now measure: */
-    bench = 0;
-    time = clock();
-    for (i = 0; i < BENCH_SAMPLES; i++) {
+    const uint64_t time = uv_hrtime();
+
+    for (uint32_t i = 0; i < BENCH_SAMPLES; i++) {
        impl->fill_segment(&instance, pos);
    }
-    time = clock() - time;
-    bench = (uint64_t)time;
-    return bench;
+
+    return uv_hrtime() - time;
 }

+
 void argon2_select_impl()
 {
    argon2_impl_list impls;
-    unsigned int i;
    const argon2_impl *best_impl = NULL;
    uint64_t best_bench = UINT_MAX;

    argon2_get_impl_list(&impls);

-    for (i = 0; i < impls.count; i++) {
+    for (uint32_t i = 0; i < impls.count; i++) {
        const argon2_impl *impl = &impls.entries[i];
-        uint64_t bench;

        if (impl->check != NULL && !impl->check()) {
            continue;
        }

-        bench = benchmark_impl(impl);
-
+        const uint64_t bench = benchmark_impl(impl);
        if (bench < best_bench) {
            best_bench = bench;
-            best_impl = impl;
+            best_impl  = impl;
        }
    }

@@ -83,11 +85,13 @@ void argon2_select_impl()
    }
 }

-void fill_segment(const argon2_instance_t *instance, argon2_position_t position)
+
+void xmrig_ar2_fill_segment(const argon2_instance_t *instance, argon2_position_t position)
 {
    selected_argon_impl.fill_segment(instance, position);
 }

+
 const char *argon2_get_impl_name()
 {
    return selected_argon_impl.name;
@@ -97,14 +101,12 @@ const char *argon2_get_impl_name()
 int argon2_select_impl_by_name(const char *name)
 {
    argon2_impl_list impls;
-    unsigned int i;
-
    argon2_get_impl_list(&impls);

-    for (i = 0; i < impls.count; i++) {
+    for (uint32_t i = 0; i < impls.count; i++) {
        const argon2_impl *impl = &impls.entries[i];

-        if (strcmp(impl->name, name) == 0) {
+        if (strcasecmp(impl->name, name) == 0) {
            selected_argon_impl = *impl;

            return 1;
--- a/src/3rdparty/getopt/getopt.h
+++ b/src/3rdparty/getopt/getopt.h
@@ -3,9 +3,9 @@
 * DISCLAIMER
 * This file is part of the mingw-w64 runtime package.
 *
- * The mingw-w64 runtime package and its code is distributed in the hope that it 
- * will be useful but WITHOUT ANY WARRANTY.  ALL WARRANTIES, EXPRESSED OR 
- * IMPLIED ARE HEREBY DISCLAIMED.  This includes but is not limited to 
+ * The mingw-w64 runtime package and its code is distributed in the hope that it
+ * will be useful but WITHOUT ANY WARRANTY.  ALL WARRANTIES, EXPRESSED OR
+ * IMPLIED ARE HEREBY DISCLAIMED.  This includes but is not limited to
 * warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
 /*
@@ -109,11 +109,7 @@ char    *optarg;		/* argument associated with option */
 extern char __declspec(dllimport) *__progname;
 #endif

-#ifdef __CYGWIN__
 static char EMSG[] = "";
-#else
-#define	EMSG		""
-#endif

 static int getopt_internal(int, char * const *, const char *,
 			   const struct option *, int *, int);
--- a/src/3rdparty/http-parser/AUTHORS
+++ b/src/3rdparty/http-parser/AUTHORS
@@ -1,68 +0,0 @@
-# Authors ordered by first contribution.
-Ryan Dahl <ry@tinyclouds.org>
-Jeremy Hinegardner <jeremy@hinegardner.org>
-Sergey Shepelev <temotor@gmail.com>
-Joe Damato <ice799@gmail.com>
-tomika <tomika_nospam@freemail.hu>
-Phoenix Sol <phoenix@burninglabs.com>
-Cliff Frey <cliff@meraki.com>
-Ewen Cheslack-Postava <ewencp@cs.stanford.edu>
-Santiago Gala <sgala@apache.org>
-Tim Becker <tim.becker@syngenio.de>
-Jeff Terrace <jterrace@gmail.com>
-Ben Noordhuis <info@bnoordhuis.nl>
-Nathan Rajlich <nathan@tootallnate.net>
-Mark Nottingham <mnot@mnot.net>
-Aman Gupta <aman@tmm1.net>
-Tim Becker <tim.becker@kuriositaet.de>
-Sean Cunningham <sean.cunningham@mandiant.com>
-Peter Griess <pg@std.in>
-Salman Haq <salman.haq@asti-usa.com>
-Cliff Frey <clifffrey@gmail.com>
-Jon Kolb <jon@b0g.us>
-Fouad Mardini <f.mardini@gmail.com>
-Paul Querna <pquerna@apache.org>
-Felix Geisendörfer <felix@debuggable.com>
-koichik <koichik@improvement.jp>
-Andre Caron <andre.l.caron@gmail.com>
-Ivo Raisr <ivosh@ivosh.net>
-James McLaughlin <jamie@lacewing-project.org>
-David Gwynne <loki@animata.net>
-Thomas LE ROUX <thomas@november-eleven.fr>
-Randy Rizun <rrizun@ortivawireless.com>
-Andre Louis Caron <andre.louis.caron@usherbrooke.ca>
-Simon Zimmermann <simonz05@gmail.com>
-Erik Dubbelboer <erik@dubbelboer.com>
-Martell Malone <martellmalone@gmail.com>
-Bertrand Paquet <bpaquet@octo.com>
-BogDan Vatra <bogdan@kde.org>
-Peter Faiman <peter@thepicard.org>
-Corey Richardson <corey@octayn.net>
-Tóth Tamás <tomika_nospam@freemail.hu>
-Cam Swords <cam.swords@gmail.com>
-Chris Dickinson <christopher.s.dickinson@gmail.com>
-Uli Köhler <ukoehler@btronik.de>
-Charlie Somerville <charlie@charliesomerville.com>
-Patrik Stutz <patrik.stutz@gmail.com>
-Fedor Indutny <fedor.indutny@gmail.com>
-runner <runner.mei@gmail.com>
-Alexis Campailla <alexis@janeasystems.com>
-David Wragg <david@wragg.org>
-Vinnie Falco <vinnie.falco@gmail.com>
-Alex Butum <alexbutum@linux.com>
-Rex Feng <rexfeng@gmail.com>
-Alex Kocharin <alex@kocharin.ru>
-Mark Koopman <markmontymark@yahoo.com>
-Helge Heß <me@helgehess.eu>
-Alexis La Goutte <alexis.lagoutte@gmail.com>
-George Miroshnykov <george.miroshnykov@gmail.com>
-Maciej Małecki <me@mmalecki.com>
-Marc O'Morain <github.com@marcomorain.com>
-Jeff Pinner <jpinner@twitter.com>
-Timothy J Fontaine <tjfontaine@gmail.com>
-Akagi201 <akagi201@gmail.com>
-Romain Giraud <giraud.romain@gmail.com>
-Jay Satiro <raysatiro@yahoo.com>
-Arne Steen <Arne.Steen@gmx.de>
-Kjell Schubert <kjell.schubert@gmail.com>
-Olivier Mengué <dolmen@cpan.org>
--- a/src/3rdparty/http-parser/LICENSE-MIT
+++ b/src/3rdparty/http-parser/LICENSE-MIT
@@ -1,19 +0,0 @@
-Copyright Joyent, Inc. and other Node contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE. 
--- a/src/3rdparty/http-parser/README.md
+++ b/src/3rdparty/http-parser/README.md
@@ -1,246 +0,0 @@
-HTTP Parser
-===========
-
-[![Build Status](https://api.travis-ci.org/nodejs/http-parser.svg?branch=master)](https://travis-ci.org/nodejs/http-parser)
-
-This is a parser for HTTP messages written in C. It parses both requests and
-responses. The parser is designed to be used in performance HTTP
-applications. It does not make any syscalls nor allocations, it does not
-buffer data, it can be interrupted at anytime. Depending on your
-architecture, it only requires about 40 bytes of data per message
-stream (in a web server that is per connection).
-
-Features:
-
-  * No dependencies
-  * Handles persistent streams (keep-alive).
-  * Decodes chunked encoding.
-  * Upgrade support
-  * Defends against buffer overflow attacks.
-
-The parser extracts the following information from HTTP messages:
-
-  * Header fields and values
-  * Content-Length
-  * Request method
-  * Response status code
-  * Transfer-Encoding
-  * HTTP version
-  * Request URL
-  * Message body
-
-
-Usage
-----
-
-One `http_parser` object is used per TCP connection. Initialize the struct
-using `http_parser_init()` and set the callbacks. That might look something
-like this for a request parser:
-```c
-http_parser_settings settings;
-settings.on_url = my_url_callback;
-settings.on_header_field = my_header_field_callback;
-/* ... */
-
-http_parser *parser = malloc(sizeof(http_parser));
-http_parser_init(parser, HTTP_REQUEST);
-parser->data = my_socket;
-```
-
-When data is received on the socket execute the parser and check for errors.
-
-```c
-size_t len = 80*1024, nparsed;
-char buf[len];
-ssize_t recved;
-
-recved = recv(fd, buf, len, 0);
-
-if (recved < 0) {
-  /* Handle error. */
-}
-
-/* Start up / continue the parser.
- * Note we pass recved==0 to signal that EOF has been received.
- */
-nparsed = http_parser_execute(parser, &settings, buf, recved);
-
-if (parser->upgrade) {
-  /* handle new protocol */
-} else if (nparsed != recved) {
-  /* Handle error. Usually just close the connection. */
-}
-```
-
-`http_parser` needs to know where the end of the stream is. For example, sometimes
-servers send responses without Content-Length and expect the client to
-consume input (for the body) until EOF. To tell `http_parser` about EOF, give
-`0` as the fourth parameter to `http_parser_execute()`. Callbacks and errors
-can still be encountered during an EOF, so one must still be prepared
-to receive them.
-
-Scalar valued message information such as `status_code`, `method`, and the
-HTTP version are stored in the parser structure. This data is only
-temporally stored in `http_parser` and gets reset on each new message. If
-this information is needed later, copy it out of the structure during the
-`headers_complete` callback.
-
-The parser decodes the transfer-encoding for both requests and responses
-transparently. That is, a chunked encoding is decoded before being sent to
-the on_body callback.
-
-
-The Special Problem of Upgrade
------------------------------
-
-`http_parser` supports upgrading the connection to a different protocol. An
-increasingly common example of this is the WebSocket protocol which sends
-a request like
-
-        GET /demo HTTP/1.1
-        Upgrade: WebSocket
-        Connection: Upgrade
-        Host: example.com
-        Origin: http://example.com
-        WebSocket-Protocol: sample
-
-followed by non-HTTP data.
-
-(See [RFC6455](https://tools.ietf.org/html/rfc6455) for more information the
-WebSocket protocol.)
-
-To support this, the parser will treat this as a normal HTTP message without a
-body, issuing both on_headers_complete and on_message_complete callbacks. However
-http_parser_execute() will stop parsing at the end of the headers and return.
-
-The user is expected to check if `parser->upgrade` has been set to 1 after
-`http_parser_execute()` returns. Non-HTTP data begins at the buffer supplied
-offset by the return value of `http_parser_execute()`.
-
-
-Callbacks
---------
-
-During the `http_parser_execute()` call, the callbacks set in
-`http_parser_settings` will be executed. The parser maintains state and
-never looks behind, so buffering the data is not necessary. If you need to
-save certain data for later usage, you can do that from the callbacks.
-
-There are two types of callbacks:
-
-* notification `typedef int (*http_cb) (http_parser*);`
-    Callbacks: on_message_begin, on_headers_complete, on_message_complete.
-* data `typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);`
-    Callbacks: (requests only) on_url,
-               (common) on_header_field, on_header_value, on_body;
-
-Callbacks must return 0 on success. Returning a non-zero value indicates
-error to the parser, making it exit immediately.
-
-For cases where it is necessary to pass local information to/from a callback,
-the `http_parser` object's `data` field can be used.
-An example of such a case is when using threads to handle a socket connection,
-parse a request, and then give a response over that socket. By instantiation
-of a thread-local struct containing relevant data (e.g. accepted socket,
-allocated memory for callbacks to write into, etc), a parser's callbacks are
-able to communicate data between the scope of the thread and the scope of the
-callback in a threadsafe manner. This allows `http_parser` to be used in
-multi-threaded contexts.
-
-Example:
-```c
- typedef struct {
-  socket_t sock;
-  void* buffer;
-  int buf_len;
- } custom_data_t;
-
-
-int my_url_callback(http_parser* parser, const char *at, size_t length) {
-  /* access to thread local custom_data_t struct.
-  Use this access save parsed data for later use into thread local
-  buffer, or communicate over socket
-  */
-  parser->data;
-  ...
-  return 0;
-}
-
-...
-
-void http_parser_thread(socket_t sock) {
- int nparsed = 0;
- /* allocate memory for user data */
- custom_data_t *my_data = malloc(sizeof(custom_data_t));
-
- /* some information for use by callbacks.
- * achieves thread -> callback information flow */
- my_data->sock = sock;
-
- /* instantiate a thread-local parser */
- http_parser *parser = malloc(sizeof(http_parser));
- http_parser_init(parser, HTTP_REQUEST); /* initialise parser */
- /* this custom data reference is accessible through the reference to the
- parser supplied to callback functions */
- parser->data = my_data;
-
- http_parser_settings settings; /* set up callbacks */
- settings.on_url = my_url_callback;
-
- /* execute parser */
- nparsed = http_parser_execute(parser, &settings, buf, recved);
-
- ...
- /* parsed information copied from callback.
- can now perform action on data copied into thread-local memory from callbacks.
- achieves callback -> thread information flow */
- my_data->buffer;
- ...
-}
-
-```
-
-In case you parse HTTP message in chunks (i.e. `read()` request line
-from socket, parse, read half headers, parse, etc) your data callbacks
-may be called more than once. `http_parser` guarantees that data pointer is only
-valid for the lifetime of callback. You can also `read()` into a heap allocated
-buffer to avoid copying memory around if this fits your application.
-
-Reading headers may be a tricky task if you read/parse headers partially.
-Basically, you need to remember whether last header callback was field or value
-and apply the following logic:
-
-    (on_header_field and on_header_value shortened to on_h_*)
-     ------------------------ ------------ --------------------------------------------
-    | State (prev. callback) | Callback   | Description/action                         |
-     ------------------------ ------------ --------------------------------------------
-    | nothing (first call)   | on_h_field | Allocate new buffer and copy callback data |
-    |                        |            | into it                                    |
-     ------------------------ ------------ --------------------------------------------
-    | value                  | on_h_field | New header started.                        |
-    |                        |            | Copy current name,value buffers to headers |
-    |                        |            | list and allocate new buffer for new name  |
-     ------------------------ ------------ --------------------------------------------
-    | field                  | on_h_field | Previous name continues. Reallocate name   |
-    |                        |            | buffer and append callback data to it      |
-     ------------------------ ------------ --------------------------------------------
-    | field                  | on_h_value | Value for current header started. Allocate |
-    |                        |            | new buffer and copy callback data to it    |
-     ------------------------ ------------ --------------------------------------------
-    | value                  | on_h_value | Value continues. Reallocate value buffer   |
-    |                        |            | and append callback data to it             |
-     ------------------------ ------------ --------------------------------------------
-
-
-Parsing URLs
------------
-
-A simplistic zero-copy URL parser is provided as `http_parser_parse_url()`.
-Users of this library may wish to use it to parse URLs constructed from
-consecutive `on_url` callbacks.
-
-See examples of reading in headers:
-
-* [partial example](http://gist.github.com/155877) in C
-* [from http-parser tests](http://github.com/joyent/http-parser/blob/37a0ff8/test.c#L403) in C
-* [from Node library](http://github.com/joyent/node/blob/842eaf4/src/http.js#L284) in Javascript
--- a/src/3rdparty/http-parser/http_parser.c
+++ b/src/3rdparty/http-parser/http_parser.c
--- a/src/3rdparty/http-parser/http_parser.h
+++ b/src/3rdparty/http-parser/http_parser.h
@@ -1,439 +0,0 @@
-/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-#ifndef http_parser_h
-#define http_parser_h
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Also update SONAME in the Makefile whenever you change these. */
-#define HTTP_PARSER_VERSION_MAJOR 2
-#define HTTP_PARSER_VERSION_MINOR 9
-#define HTTP_PARSER_VERSION_PATCH 0
-
-#include <stddef.h>
-#if defined(_WIN32) && !defined(__MINGW32__) && \
-  (!defined(_MSC_VER) || _MSC_VER<1600) && !defined(__WINE__)
-#include <BaseTsd.h>
-typedef __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <stdint.h>
-#endif
-
-/* Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run
- * faster
- */
-#ifndef HTTP_PARSER_STRICT
-# define HTTP_PARSER_STRICT 1
-#endif
-
-/* Maximium header size allowed. If the macro is not defined
- * before including this header then the default is used. To
- * change the maximum header size, define the macro in the build
- * environment (e.g. -DHTTP_MAX_HEADER_SIZE=<value>). To remove
- * the effective limit on the size of the header, define the macro
- * to a very large number (e.g. -DHTTP_MAX_HEADER_SIZE=0x7fffffff)
- */
-#ifndef HTTP_MAX_HEADER_SIZE
-# define HTTP_MAX_HEADER_SIZE (80*1024)
-#endif
-
-typedef struct http_parser http_parser;
-typedef struct http_parser_settings http_parser_settings;
-
-
-/* Callbacks should return non-zero to indicate an error. The parser will
- * then halt execution.
- *
- * The one exception is on_headers_complete. In a HTTP_RESPONSE parser
- * returning '1' from on_headers_complete will tell the parser that it
- * should not expect a body. This is used when receiving a response to a
- * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
- * chunked' headers that indicate the presence of a body.
- *
- * Returning `2` from on_headers_complete will tell parser that it should not
- * expect neither a body nor any futher responses on this connection. This is
- * useful for handling responses to a CONNECT request which may not contain
- * `Upgrade` or `Connection: upgrade` headers.
- *
- * http_data_cb does not return data chunks. It will be called arbitrarily
- * many times for each string. E.G. you might get 10 callbacks for "on_url"
- * each providing just a few characters more data.
- */
-typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);
-typedef int (*http_cb) (http_parser*);
-
-
-/* Status Codes */
-#define HTTP_STATUS_MAP(XX)                                                 \
-  XX(100, CONTINUE,                        Continue)                        \
-  XX(101, SWITCHING_PROTOCOLS,             Switching Protocols)             \
-  XX(102, PROCESSING,                      Processing)                      \
-  XX(200, OK,                              OK)                              \
-  XX(201, CREATED,                         Created)                         \
-  XX(202, ACCEPTED,                        Accepted)                        \
-  XX(203, NON_AUTHORITATIVE_INFORMATION,   Non-Authoritative Information)   \
-  XX(204, NO_CONTENT,                      No Content)                      \
-  XX(205, RESET_CONTENT,                   Reset Content)                   \
-  XX(206, PARTIAL_CONTENT,                 Partial Content)                 \
-  XX(207, MULTI_STATUS,                    Multi-Status)                    \
-  XX(208, ALREADY_REPORTED,                Already Reported)                \
-  XX(226, IM_USED,                         IM Used)                         \
-  XX(300, MULTIPLE_CHOICES,                Multiple Choices)                \
-  XX(301, MOVED_PERMANENTLY,               Moved Permanently)               \
-  XX(302, FOUND,                           Found)                           \
-  XX(303, SEE_OTHER,                       See Other)                       \
-  XX(304, NOT_MODIFIED,                    Not Modified)                    \
-  XX(305, USE_PROXY,                       Use Proxy)                       \
-  XX(307, TEMPORARY_REDIRECT,              Temporary Redirect)              \
-  XX(308, PERMANENT_REDIRECT,              Permanent Redirect)              \
-  XX(400, BAD_REQUEST,                     Bad Request)                     \
-  XX(401, UNAUTHORIZED,                    Unauthorized)                    \
-  XX(402, PAYMENT_REQUIRED,                Payment Required)                \
-  XX(403, FORBIDDEN,                       Forbidden)                       \
-  XX(404, NOT_FOUND,                       Not Found)                       \
-  XX(405, METHOD_NOT_ALLOWED,              Method Not Allowed)              \
-  XX(406, NOT_ACCEPTABLE,                  Not Acceptable)                  \
-  XX(407, PROXY_AUTHENTICATION_REQUIRED,   Proxy Authentication Required)   \
-  XX(408, REQUEST_TIMEOUT,                 Request Timeout)                 \
-  XX(409, CONFLICT,                        Conflict)                        \
-  XX(410, GONE,                            Gone)                            \
-  XX(411, LENGTH_REQUIRED,                 Length Required)                 \
-  XX(412, PRECONDITION_FAILED,             Precondition Failed)             \
-  XX(413, PAYLOAD_TOO_LARGE,               Payload Too Large)               \
-  XX(414, URI_TOO_LONG,                    URI Too Long)                    \
-  XX(415, UNSUPPORTED_MEDIA_TYPE,          Unsupported Media Type)          \
-  XX(416, RANGE_NOT_SATISFIABLE,           Range Not Satisfiable)           \
-  XX(417, EXPECTATION_FAILED,              Expectation Failed)              \
-  XX(421, MISDIRECTED_REQUEST,             Misdirected Request)             \
-  XX(422, UNPROCESSABLE_ENTITY,            Unprocessable Entity)            \
-  XX(423, LOCKED,                          Locked)                          \
-  XX(424, FAILED_DEPENDENCY,               Failed Dependency)               \
-  XX(426, UPGRADE_REQUIRED,                Upgrade Required)                \
-  XX(428, PRECONDITION_REQUIRED,           Precondition Required)           \
-  XX(429, TOO_MANY_REQUESTS,               Too Many Requests)               \
-  XX(431, REQUEST_HEADER_FIELDS_TOO_LARGE, Request Header Fields Too Large) \
-  XX(451, UNAVAILABLE_FOR_LEGAL_REASONS,   Unavailable For Legal Reasons)   \
-  XX(500, INTERNAL_SERVER_ERROR,           Internal Server Error)           \
-  XX(501, NOT_IMPLEMENTED,                 Not Implemented)                 \
-  XX(502, BAD_GATEWAY,                     Bad Gateway)                     \
-  XX(503, SERVICE_UNAVAILABLE,             Service Unavailable)             \
-  XX(504, GATEWAY_TIMEOUT,                 Gateway Timeout)                 \
-  XX(505, HTTP_VERSION_NOT_SUPPORTED,      HTTP Version Not Supported)      \
-  XX(506, VARIANT_ALSO_NEGOTIATES,         Variant Also Negotiates)         \
-  XX(507, INSUFFICIENT_STORAGE,            Insufficient Storage)            \
-  XX(508, LOOP_DETECTED,                   Loop Detected)                   \
-  XX(510, NOT_EXTENDED,                    Not Extended)                    \
-  XX(511, NETWORK_AUTHENTICATION_REQUIRED, Network Authentication Required) \
-
-enum http_status
-  {
-#define XX(num, name, string) HTTP_STATUS_##name = num,
-  HTTP_STATUS_MAP(XX)
-#undef XX
-  };
-
-
-/* Request Methods */
-#define HTTP_METHOD_MAP(XX)         \
-  XX(0,  DELETE,      DELETE)       \
-  XX(1,  GET,         GET)          \
-  XX(2,  HEAD,        HEAD)         \
-  XX(3,  POST,        POST)         \
-  XX(4,  PUT,         PUT)          \
-  /* pathological */                \
-  XX(5,  CONNECT,     CONNECT)      \
-  XX(6,  OPTIONS,     OPTIONS)      \
-  XX(7,  TRACE,       TRACE)        \
-  /* WebDAV */                      \
-  XX(8,  COPY,        COPY)         \
-  XX(9,  LOCK,        LOCK)         \
-  XX(10, MKCOL,       MKCOL)        \
-  XX(11, MOVE,        MOVE)         \
-  XX(12, PROPFIND,    PROPFIND)     \
-  XX(13, PROPPATCH,   PROPPATCH)    \
-  XX(14, SEARCH,      SEARCH)       \
-  XX(15, UNLOCK,      UNLOCK)       \
-  XX(16, BIND,        BIND)         \
-  XX(17, REBIND,      REBIND)       \
-  XX(18, UNBIND,      UNBIND)       \
-  XX(19, ACL,         ACL)          \
-  /* subversion */                  \
-  XX(20, REPORT,      REPORT)       \
-  XX(21, MKACTIVITY,  MKACTIVITY)   \
-  XX(22, CHECKOUT,    CHECKOUT)     \
-  XX(23, MERGE,       MERGE)        \
-  /* upnp */                        \
-  XX(24, MSEARCH,     M-SEARCH)     \
-  XX(25, NOTIFY,      NOTIFY)       \
-  XX(26, SUBSCRIBE,   SUBSCRIBE)    \
-  XX(27, UNSUBSCRIBE, UNSUBSCRIBE)  \
-  /* RFC-5789 */                    \
-  XX(28, PATCH,       PATCH)        \
-  XX(29, PURGE,       PURGE)        \
-  /* CalDAV */                      \
-  XX(30, MKCALENDAR,  MKCALENDAR)   \
-  /* RFC-2068, section 19.6.1.2 */  \
-  XX(31, LINK,        LINK)         \
-  XX(32, UNLINK,      UNLINK)       \
-  /* icecast */                     \
-  XX(33, SOURCE,      SOURCE)       \
-
-enum http_method
-  {
-#define XX(num, name, string) HTTP_##name = num,
-  HTTP_METHOD_MAP(XX)
-#undef XX
-  };
-
-
-enum http_parser_type { HTTP_REQUEST, HTTP_RESPONSE, HTTP_BOTH };
-
-
-/* Flag values for http_parser.flags field */
-enum flags
-  { F_CHUNKED               = 1 << 0
-  , F_CONNECTION_KEEP_ALIVE = 1 << 1
-  , F_CONNECTION_CLOSE      = 1 << 2
-  , F_CONNECTION_UPGRADE    = 1 << 3
-  , F_TRAILING              = 1 << 4
-  , F_UPGRADE               = 1 << 5
-  , F_SKIPBODY              = 1 << 6
-  , F_CONTENTLENGTH         = 1 << 7
-  };
-
-
-/* Map for errno-related constants
- *
- * The provided argument should be a macro that takes 2 arguments.
- */
-#define HTTP_ERRNO_MAP(XX)                                           \
-  /* No error */                                                     \
-  XX(OK, "success")                                                  \
-                                                                     \
-  /* Callback-related errors */                                      \
-  XX(CB_message_begin, "the on_message_begin callback failed")       \
-  XX(CB_url, "the on_url callback failed")                           \
-  XX(CB_header_field, "the on_header_field callback failed")         \
-  XX(CB_header_value, "the on_header_value callback failed")         \
-  XX(CB_headers_complete, "the on_headers_complete callback failed") \
-  XX(CB_body, "the on_body callback failed")                         \
-  XX(CB_message_complete, "the on_message_complete callback failed") \
-  XX(CB_status, "the on_status callback failed")                     \
-  XX(CB_chunk_header, "the on_chunk_header callback failed")         \
-  XX(CB_chunk_complete, "the on_chunk_complete callback failed")     \
-                                                                     \
-  /* Parsing-related errors */                                       \
-  XX(INVALID_EOF_STATE, "stream ended at an unexpected time")        \
-  XX(HEADER_OVERFLOW,                                                \
-     "too many header bytes seen; overflow detected")                \
-  XX(CLOSED_CONNECTION,                                              \
-     "data received after completed connection: close message")      \
-  XX(INVALID_VERSION, "invalid HTTP version")                        \
-  XX(INVALID_STATUS, "invalid HTTP status code")                     \
-  XX(INVALID_METHOD, "invalid HTTP method")                          \
-  XX(INVALID_URL, "invalid URL")                                     \
-  XX(INVALID_HOST, "invalid host")                                   \
-  XX(INVALID_PORT, "invalid port")                                   \
-  XX(INVALID_PATH, "invalid path")                                   \
-  XX(INVALID_QUERY_STRING, "invalid query string")                   \
-  XX(INVALID_FRAGMENT, "invalid fragment")                           \
-  XX(LF_EXPECTED, "LF character expected")                           \
-  XX(INVALID_HEADER_TOKEN, "invalid character in header")            \
-  XX(INVALID_CONTENT_LENGTH,                                         \
-     "invalid character in content-length header")                   \
-  XX(UNEXPECTED_CONTENT_LENGTH,                                      \
-     "unexpected content-length header")                             \
-  XX(INVALID_CHUNK_SIZE,                                             \
-     "invalid character in chunk size header")                       \
-  XX(INVALID_CONSTANT, "invalid constant string")                    \
-  XX(INVALID_INTERNAL_STATE, "encountered unexpected internal state")\
-  XX(STRICT, "strict mode assertion failed")                         \
-  XX(PAUSED, "parser is paused")                                     \
-  XX(UNKNOWN, "an unknown error occurred")
-
-
-/* Define HPE_* values for each errno value above */
-#define HTTP_ERRNO_GEN(n, s) HPE_##n,
-enum http_errno {
-  HTTP_ERRNO_MAP(HTTP_ERRNO_GEN)
-};
-#undef HTTP_ERRNO_GEN
-
-
-/* Get an http_errno value from an http_parser */
-#define HTTP_PARSER_ERRNO(p)            ((enum http_errno) (p)->http_errno)
-
-
-struct http_parser {
-  /** PRIVATE **/
-  unsigned int type : 2;         /* enum http_parser_type */
-  unsigned int flags : 8;        /* F_* values from 'flags' enum; semi-public */
-  unsigned int state : 7;        /* enum state from http_parser.c */
-  unsigned int header_state : 7; /* enum header_state from http_parser.c */
-  unsigned int index : 7;        /* index into current matcher */
-  unsigned int lenient_http_headers : 1;
-
-  uint32_t nread;          /* # bytes read in various scenarios */
-  uint64_t content_length; /* # bytes in body (0 if no Content-Length header) */
-
-  /** READ-ONLY **/
-  unsigned short http_major;
-  unsigned short http_minor;
-  unsigned int status_code : 16; /* responses only */
-  unsigned int method : 8;       /* requests only */
-  unsigned int http_errno : 7;
-
-  /* 1 = Upgrade header was present and the parser has exited because of that.
-   * 0 = No upgrade header present.
-   * Should be checked when http_parser_execute() returns in addition to
-   * error checking.
-   */
-  unsigned int upgrade : 1;
-
-  /** PUBLIC **/
-  void *data; /* A pointer to get hook to the "connection" or "socket" object */
-};
-
-
-struct http_parser_settings {
-  http_cb      on_message_begin;
-  http_data_cb on_url;
-  http_data_cb on_status;
-  http_data_cb on_header_field;
-  http_data_cb on_header_value;
-  http_cb      on_headers_complete;
-  http_data_cb on_body;
-  http_cb      on_message_complete;
-  /* When on_chunk_header is called, the current chunk length is stored
-   * in parser->content_length.
-   */
-  http_cb      on_chunk_header;
-  http_cb      on_chunk_complete;
-};
-
-
-enum http_parser_url_fields
-  { UF_SCHEMA           = 0
-  , UF_HOST             = 1
-  , UF_PORT             = 2
-  , UF_PATH             = 3
-  , UF_QUERY            = 4
-  , UF_FRAGMENT         = 5
-  , UF_USERINFO         = 6
-  , UF_MAX              = 7
-  };
-
-
-/* Result structure for http_parser_parse_url().
- *
- * Callers should index into field_data[] with UF_* values iff field_set
- * has the relevant (1 << UF_*) bit set. As a courtesy to clients (and
- * because we probably have padding left over), we convert any port to
- * a uint16_t.
- */
-struct http_parser_url {
-  uint16_t field_set;           /* Bitmask of (1 << UF_*) values */
-  uint16_t port;                /* Converted UF_PORT string */
-
-  struct {
-    uint16_t off;               /* Offset into buffer in which field starts */
-    uint16_t len;               /* Length of run in buffer */
-  } field_data[UF_MAX];
-};
-
-
-/* Returns the library version. Bits 16-23 contain the major version number,
- * bits 8-15 the minor version number and bits 0-7 the patch level.
- * Usage example:
- *
- *   unsigned long version = http_parser_version();
- *   unsigned major = (version >> 16) & 255;
- *   unsigned minor = (version >> 8) & 255;
- *   unsigned patch = version & 255;
- *   printf("http_parser v%u.%u.%u\n", major, minor, patch);
- */
-unsigned long http_parser_version(void);
-
-void http_parser_init(http_parser *parser, enum http_parser_type type);
-
-
-/* Initialize http_parser_settings members to 0
- */
-void http_parser_settings_init(http_parser_settings *settings);
-
-
-/* Executes the parser. Returns number of parsed bytes. Sets
- * `parser->http_errno` on error. */
-size_t http_parser_execute(http_parser *parser,
-                           const http_parser_settings *settings,
-                           const char *data,
-                           size_t len);
-
-
-/* If http_should_keep_alive() in the on_headers_complete or
- * on_message_complete callback returns 0, then this should be
- * the last message on the connection.
- * If you are the server, respond with the "Connection: close" header.
- * If you are the client, close the connection.
- */
-int http_should_keep_alive(const http_parser *parser);
-
-/* Returns a string version of the HTTP method. */
-const char *http_method_str(enum http_method m);
-
-/* Returns a string version of the HTTP status code. */
-const char *http_status_str(enum http_status s);
-
-/* Return a string name of the given error */
-const char *http_errno_name(enum http_errno err);
-
-/* Return a string description of the given error */
-const char *http_errno_description(enum http_errno err);
-
-/* Initialize all http_parser_url members to 0 */
-void http_parser_url_init(struct http_parser_url *u);
-
-/* Parse a URL; return nonzero on failure */
-int http_parser_parse_url(const char *buf, size_t buflen,
-                          int is_connect,
-                          struct http_parser_url *u);
-
-/* Pause or un-pause the parser; a nonzero value pauses */
-void http_parser_pause(http_parser *parser, int paused);
-
-/* Checks if this is the final chunk of the body. */
-int http_body_is_final(const http_parser *parser);
-
-/* Change the maximum header size provided at compile time. */
-void http_parser_set_max_header_size(uint32_t size);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
--- a/src/3rdparty/hwloc/AUTHORS
+++ b/src/3rdparty/hwloc/AUTHORS
@@ -1,45 +0,0 @@
-hwloc Authors
-=============
-
-The following cumulative list contains the names of most individuals
-who have committed code to the hwloc repository
-(either directly or through a third party).
-
-Name                         Affiliation(s)
---------------------------  --------------------
-Grzegorz Andrejczuk          Intel
-Cédric Augonnet              University of Bordeaux
-Guillaume Beauchamp          Inria
-Ahmad Boissetri Binzagr      Inria
-Cyril Bordage                Inria
-Nicholas Buroker             UWL
-Christopher M. Cantalupo     Intel
-Jérôme Clet-Ortega           University of Bordeaux
-Ludovic Courtès              Inria
-Clément Foyer                Inria
-Nathalie Furmento            CNRS
-Bryon Gloden
-Brice Goglin                 Inria
-Gilles Gouaillardet          RIST
-Valentin Hoyet               Inria
-Joshua Hursey                UWL
-Alexey Kardashevskiy         IBM
-Rob Latham                   ANL
-Douglas MacFarland           UWL
-Marc Marí                    BSC
-Jonathan L Peyton            Intel
-Piotr Luc                    Intel
-Antoine Rougier              intern from University of Bordeaux
-Jeff Squyres                 Cisco
-Samuel Thibault              University of Bordeaux
-Jean-Yves VET                DDN
-Benjamin Worpitz
-Jeff Zhao                    Zhaoxin
-
-Affiliaion abbreviations:
-------------------------
-ANL = Argonne National Lab
-BSC = Barcelona Supercomputing Center
-Cisco = Cisco Systems, Inc.
-CNRS = Centre national de la recherche scientifique (France)
-UWL = University of Wisconsin-La Crosse
--- a/src/3rdparty/hwloc/CMakeLists.txt
+++ b/src/3rdparty/hwloc/CMakeLists.txt
@@ -1,38 +0,0 @@
-cmake_minimum_required (VERSION 2.8)
-project (hwloc C)
-
-include_directories(include)
-include_directories(src)
-
-add_definitions(/D_CRT_SECURE_NO_WARNINGS)
-set(CMAKE_C_FLAGS_RELEASE "/MT /O2 /Ob2 /DNDEBUG")
-
-set(HEADERS
-    include/hwloc.h
-    src/static-components.h
-    )
-
-set(SOURCES
-	src/base64.c
-	src/bind.c
-	src/bitmap.c
-	src/components.c
-	src/diff.c
-	src/distances.c
-	src/misc.c
-	src/pci-common.c
-	src/shmem.c
-	src/topology.c
-	src/topology-noos.c
-	src/topology-synthetic.c
-	src/topology-windows.c
-	src/topology-x86.c
-	src/topology-xml.c
-	src/topology-xml-nolibxml.c
-    src/traversal.c
-   )
-
-add_library(hwloc STATIC
-    ${HEADERS}
-    ${SOURCES}
-    )
--- a/src/3rdparty/hwloc/COPYING
+++ b/src/3rdparty/hwloc/COPYING
@@ -1,39 +0,0 @@
-Copyright © 2004-2006 The Trustees of Indiana University and Indiana University Research and Technology Corporation.  All rights reserved.
-Copyright © 2004-2005 The University of Tennessee and The University of Tennessee Research Foundation.  All rights reserved.
-Copyright © 2004-2005 High Performance Computing Center Stuttgart, University of Stuttgart.  All rights reserved.
-Copyright © 2004-2005 The Regents of the University of California. All rights reserved.
-Copyright © 2009      CNRS
-Copyright © 2009-2016 Inria.  All rights reserved.
-Copyright © 2009-2015 Université Bordeaux
-Copyright © 2009-2015 Cisco Systems, Inc.  All rights reserved.
-Copyright © 2009-2012 Oracle and/or its affiliates.  All rights reserved.
-Copyright © 2010      IBM
-Copyright © 2010      Jirka Hladky
-Copyright © 2012      Aleksej Saushev, The NetBSD Foundation
-Copyright © 2012      Blue Brain Project, EPFL. All rights reserved.
-Copyright © 2013-2014 University of Wisconsin-La Crosse. All rights reserved.
-Copyright © 2015      Research Organization for Information Science and Technology (RIST). All rights reserved.
-Copyright © 2015-2016 Intel, Inc.  All rights reserved.
-See COPYING in top-level directory.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/src/3rdparty/hwloc/NEWS
+++ b/src/3rdparty/hwloc/NEWS
--- a/src/3rdparty/hwloc/README
+++ b/src/3rdparty/hwloc/README
@@ -1,85 +0,0 @@
-Introduction
-
-The Hardware Locality (hwloc) software project aims at easing the process of
-discovering hardware resources in parallel architectures. It offers
-command-line tools and a C API for consulting these resources, their locality,
-attributes, and interconnection. hwloc primarily aims at helping
-high-performance computing (HPC) applications, but is also applicable to any
-project seeking to exploit code and/or data locality on modern computing
-platforms.
-
-hwloc is actually made of two subprojects distributed together:
-
-  * The original hwloc project for describing the internals of computing nodes.
- It is described in details starting at section Hardware Locality (hwloc)
- Introduction.
-  * The network-oriented companion called netloc (Network Locality), described
- in details starting with section Network Locality (netloc).
-
-See also the Related pages tab above for links to other sections.
-
-Netloc may be disabled, but the original hwloc cannot. Both hwloc and netloc
-APIs are documented after these sections.
-
-Installation
-
-hwloc (http://www.open-mpi.org/projects/hwloc/) is available under the BSD
-license. It is hosted as a sub-project of the overall Open MPI project (http://
-www.open-mpi.org/). Note that hwloc does not require any functionality from
-Open MPI -- it is a wholly separate (and much smaller!) project and code base.
-It just happens to be hosted as part of the overall Open MPI project.
-
-Basic Installation
-
-Installation is the fairly common GNU-based process:
-
-shell$ ./configure --prefix=...
-shell$ make
-shell$ make install
-
-hwloc- and netloc-specific configure options and requirements are documented in
-sections hwloc Installation and Netloc Installation respectively.
-
-Also note that if you install supplemental libraries in non-standard locations,
-hwloc's configure script may not be able to find them without some help. You
-may need to specify additional CPPFLAGS, LDFLAGS, or PKG_CONFIG_PATH values on
-the configure command line.
-
-For example, if libpciaccess was installed into /opt/pciaccess, hwloc's
-configure script may not find it be default. Try adding PKG_CONFIG_PATH to the
-./configure command line, like this:
-
-./configure PKG_CONFIG_PATH=/opt/pciaccess/lib/pkgconfig ...
-
-Running the "lstopo" tool is a good way to check as a graphical output whether
-hwloc properly detected the architecture of your node. Netloc command-line
-tools can be used to display the network topology interconnecting your nodes.
-
-Installing from a Git clone
-
-Additionally, the code can be directly cloned from Git:
-
-shell$ git clone https://github.com/open-mpi/hwloc.git
-shell$ cd hwloc
-shell$ ./autogen.sh
-
-Note that GNU Autoconf >=2.63, Automake >=1.11 and Libtool >=2.2.6 are required
-when building from a Git clone.
-
-Nightly development snapshots are available on the web site, they can be
-configured and built without any need for Git or GNU Autotools.
-
-Questions and Bugs
-
-Bugs should be reported in the tracker (https://github.com/open-mpi/hwloc/
-issues). Opening a new issue automatically displays lots of hints about how to
-debug and report issues.
-
-Questions may be sent to the users or developers mailing lists (http://
-www.open-mpi.org/community/lists/hwloc.php).
-
-There is also a #hwloc IRC channel on Freenode (irc.freenode.net).
-
-
-
-See https://www.open-mpi.org/projects/hwloc/doc/ for more hwloc documentation.
--- a/src/3rdparty/hwloc/VERSION
+++ b/src/3rdparty/hwloc/VERSION
@@ -1,47 +0,0 @@
-# This is the VERSION file for hwloc, describing the precise version
-# of hwloc in this distribution.  The various components of the version
-# number below are combined to form a single version number string.
-
-# major, minor, and release are generally combined in the form
-# <major>.<minor>.<release>.  If release is zero, then it is omitted.
-
-# Please update HWLOC_VERSION* in contrib/windows/hwloc_config.h too.
-
-major=2
-minor=1
-release=0
-
-# greek is used for alpha or beta release tags.  If it is non-empty,
-# it will be appended to the version number.  It does not have to be
-# numeric.  Common examples include a1 (alpha release 1), b1 (beta
-# release 1), sc2005 (Super Computing 2005 release).  The only
-# requirement is that it must be entirely printable ASCII characters
-# and have no white space.
-
-greek=
-
-# The date when this release was created
-
-date="Sep 30, 2019"
-
-# If snapshot=1, then use the value from snapshot_version as the
-# entire hwloc version (i.e., ignore major, minor, release, and
-# greek).  This is only set to 1 when making snapshot tarballs.
-snapshot=0
-snapshot_version=${major}.${minor}.${release}${greek}-git
-
-# The shared library version of hwloc's public library.  This version
-# is maintained in accordance with the "Library Interface Versions"
-# chapter from the GNU Libtool documentation.  Notes:
-
-# 1. Since version numbers are associated with *releases*, the version
-# number maintained on the hwloc git master (and developer branches)
-# is always 0:0:0.
-
-# 2. Version numbers are described in the Libtool current:revision:age
-# format.
-
-libhwloc_so_version=16:0:1
-libnetloc_so_version=0:0:0
-
-# Please also update the <TargetName> lines in contrib/windows/libhwloc.vcxproj
--- a/src/3rdparty/hwloc/include/hwloc.h
+++ b/src/3rdparty/hwloc/include/hwloc.h
--- a/src/3rdparty/hwloc/include/hwloc/autogen/config.h
+++ b/src/3rdparty/hwloc/include/hwloc/autogen/config.h
@@ -1,59 +0,0 @@
-/*
- * Copyright © 2009 CNRS
- * Copyright © 2009-2018 Inria.  All rights reserved.
- * Copyright © 2009-2012 Université Bordeaux
- * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
- * See COPYING in top-level directory.
- */
-
-/* The configuration file */
-
-#ifndef HWLOC_CONFIG_H
-#define HWLOC_CONFIG_H
-
-#define HWLOC_VERSION "2.1.0"
-#define HWLOC_VERSION_MAJOR 2
-#define HWLOC_VERSION_MINOR 1
-#define HWLOC_VERSION_RELEASE 0
-#define HWLOC_VERSION_GREEK ""
-
-#define __hwloc_restrict
-#define __hwloc_inline __inline
-
-#define __hwloc_attribute_unused
-#define __hwloc_attribute_malloc
-#define __hwloc_attribute_const
-#define __hwloc_attribute_pure
-#define __hwloc_attribute_deprecated
-#define __hwloc_attribute_may_alias
-#define __hwloc_attribute_warn_unused_result
-
-/* Defined to 1 if you have the `windows.h' header. */
-#define HWLOC_HAVE_WINDOWS_H 1
-#define hwloc_pid_t HANDLE
-#define hwloc_thread_t HANDLE
-
-#include <windows.h>
-#include <BaseTsd.h>
-typedef DWORDLONG hwloc_uint64_t;
-
-#if defined( _USRDLL ) /* dynamic linkage */
-#if defined( DECLSPEC_EXPORTS )
-#define HWLOC_DECLSPEC __declspec(dllexport)
-#else
-#define HWLOC_DECLSPEC __declspec(dllimport)
-#endif
-#else /* static linkage */
-#define HWLOC_DECLSPEC
-#endif
-
-/* Whether we need to re-define all the hwloc public symbols or not */
-#define HWLOC_SYM_TRANSFORM 0
-
-/* The hwloc symbol prefix */
-#define HWLOC_SYM_PREFIX hwloc_
-
-/* The hwloc symbol prefix in all caps */
-#define HWLOC_SYM_PREFIX_CAPS HWLOC_
-
-#endif /* HWLOC_CONFIG_H */
--- a/src/3rdparty/hwloc/include/hwloc/bitmap.h
+++ b/src/3rdparty/hwloc/include/hwloc/bitmap.h
@@ -1,494 +0,0 @@
-/*
- * Copyright © 2009 CNRS
- * Copyright © 2009-2018 Inria.  All rights reserved.
- * Copyright © 2009-2012 Université Bordeaux
- * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
- * See COPYING in top-level directory.
- */
-
-/** \file
- * \brief The bitmap API, for use in hwloc itself.
- */
-
-#ifndef HWLOC_BITMAP_H
-#define HWLOC_BITMAP_H
-
-#include "hwloc/autogen/config.h"
-
-#include <assert.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** \defgroup hwlocality_bitmap The bitmap API
- *
- * The ::hwloc_bitmap_t type represents a set of integers (positive or null).
- * A bitmap may be of infinite size (all bits are set after some point).
- * A bitmap may even be full if all bits are set.
- *
- * Bitmaps are used by hwloc for sets of OS processors
- * (which may actually be hardware threads) as by ::hwloc_cpuset_t
- * (a typedef for ::hwloc_bitmap_t), or sets of NUMA memory nodes
- * as ::hwloc_nodeset_t (also a typedef for ::hwloc_bitmap_t).
- * Those are used for cpuset and nodeset fields in the ::hwloc_obj structure,
- * see \ref hwlocality_object_sets.
- *
- * <em>Both CPU and node sets are always indexed by OS physical number.</em>
- * However users should usually not build CPU and node sets manually
- * (e.g. with hwloc_bitmap_set()).
- * One should rather use existing object sets and combine them with
- * hwloc_bitmap_or(), etc.
- * For instance, binding the current thread on a pair of cores may be performed with:
- * \code
- * hwloc_obj_t core1 = ... , core2 = ... ;
- * hwloc_bitmap_t set = hwloc_bitmap_alloc();
- * hwloc_bitmap_or(set, core1->cpuset, core2->cpuset);
- * hwloc_set_cpubind(topology, set, HWLOC_CPUBIND_THREAD);
- * hwloc_bitmap_free(set);
- * \endcode
- *
- * \note Most functions below return an int that may be negative in case of
- * error. The usual error case would be an internal failure to realloc/extend
- * the storage of the bitmap (\p errno would be set to \c ENOMEM).
- *
- * \note Several examples of using the bitmap API are available under the
- * doc/examples/ directory in the source tree.
- * Regression tests such as tests/hwloc/hwloc_bitmap*.c also make intensive use
- * of this API.
- * @{
- */
-
-
-/** \brief
- * Set of bits represented as an opaque pointer to an internal bitmap.
- */
-typedef struct hwloc_bitmap_s * hwloc_bitmap_t;
-/** \brief a non-modifiable ::hwloc_bitmap_t */
-typedef const struct hwloc_bitmap_s * hwloc_const_bitmap_t;
-
-
-/*
- * Bitmap allocation, freeing and copying.
- */
-
-/** \brief Allocate a new empty bitmap.
- *
- * \returns A valid bitmap or \c NULL.
- *
- * The bitmap should be freed by a corresponding call to
- * hwloc_bitmap_free().
- */
-HWLOC_DECLSPEC hwloc_bitmap_t hwloc_bitmap_alloc(void) __hwloc_attribute_malloc;
-
-/** \brief Allocate a new full bitmap. */
-HWLOC_DECLSPEC hwloc_bitmap_t hwloc_bitmap_alloc_full(void) __hwloc_attribute_malloc;
-
-/** \brief Free bitmap \p bitmap.
- *
- * If \p bitmap is \c NULL, no operation is performed.
- */
-HWLOC_DECLSPEC void hwloc_bitmap_free(hwloc_bitmap_t bitmap);
-
-/** \brief Duplicate bitmap \p bitmap by allocating a new bitmap and copying \p bitmap contents.
- *
- * If \p bitmap is \c NULL, \c NULL is returned.
- */
-HWLOC_DECLSPEC hwloc_bitmap_t hwloc_bitmap_dup(hwloc_const_bitmap_t bitmap) __hwloc_attribute_malloc;
-
-/** \brief Copy the contents of bitmap \p src into the already allocated bitmap \p dst */
-HWLOC_DECLSPEC int hwloc_bitmap_copy(hwloc_bitmap_t dst, hwloc_const_bitmap_t src);
-
-
-/*
- * Bitmap/String Conversion
- */
-
-/** \brief Stringify a bitmap.
- *
- * Up to \p buflen characters may be written in buffer \p buf.
- *
- * If \p buflen is 0, \p buf may safely be \c NULL.
- *
- * \return the number of character that were actually written if not truncating,
- * or that would have been written (not including the ending \\0).
- */
-HWLOC_DECLSPEC int hwloc_bitmap_snprintf(char * __hwloc_restrict buf, size_t buflen, hwloc_const_bitmap_t bitmap);
-
-/** \brief Stringify a bitmap into a newly allocated string.
- *
- * \return -1 on error.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_asprintf(char ** strp, hwloc_const_bitmap_t bitmap);
-
-/** \brief Parse a bitmap string and stores it in bitmap \p bitmap.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_sscanf(hwloc_bitmap_t bitmap, const char * __hwloc_restrict string);
-
-/** \brief Stringify a bitmap in the list format.
- *
- * Lists are comma-separated indexes or ranges.
- * Ranges are dash separated indexes.
- * The last range may not have an ending indexes if the bitmap is infinitely set.
- *
- * Up to \p buflen characters may be written in buffer \p buf.
- *
- * If \p buflen is 0, \p buf may safely be \c NULL.
- *
- * \return the number of character that were actually written if not truncating,
- * or that would have been written (not including the ending \\0).
- */
-HWLOC_DECLSPEC int hwloc_bitmap_list_snprintf(char * __hwloc_restrict buf, size_t buflen, hwloc_const_bitmap_t bitmap);
-
-/** \brief Stringify a bitmap into a newly allocated list string.
- *
- * \return -1 on error.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_list_asprintf(char ** strp, hwloc_const_bitmap_t bitmap);
-
-/** \brief Parse a list string and stores it in bitmap \p bitmap.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_list_sscanf(hwloc_bitmap_t bitmap, const char * __hwloc_restrict string);
-
-/** \brief Stringify a bitmap in the taskset-specific format.
- *
- * The taskset command manipulates bitmap strings that contain a single
- * (possible very long) hexadecimal number starting with 0x.
- *
- * Up to \p buflen characters may be written in buffer \p buf.
- *
- * If \p buflen is 0, \p buf may safely be \c NULL.
- *
- * \return the number of character that were actually written if not truncating,
- * or that would have been written (not including the ending \\0).
- */
-HWLOC_DECLSPEC int hwloc_bitmap_taskset_snprintf(char * __hwloc_restrict buf, size_t buflen, hwloc_const_bitmap_t bitmap);
-
-/** \brief Stringify a bitmap into a newly allocated taskset-specific string.
- *
- * \return -1 on error.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_taskset_asprintf(char ** strp, hwloc_const_bitmap_t bitmap);
-
-/** \brief Parse a taskset-specific bitmap string and stores it in bitmap \p bitmap.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_taskset_sscanf(hwloc_bitmap_t bitmap, const char * __hwloc_restrict string);
-
-
-/*
- * Building bitmaps.
- */
-
-/** \brief Empty the bitmap \p bitmap */
-HWLOC_DECLSPEC void hwloc_bitmap_zero(hwloc_bitmap_t bitmap);
-
-/** \brief Fill bitmap \p bitmap with all possible indexes (even if those objects don't exist or are otherwise unavailable) */
-HWLOC_DECLSPEC void hwloc_bitmap_fill(hwloc_bitmap_t bitmap);
-
-/** \brief Empty the bitmap \p bitmap and add bit \p id */
-HWLOC_DECLSPEC int hwloc_bitmap_only(hwloc_bitmap_t bitmap, unsigned id);
-
-/** \brief Fill the bitmap \p and clear the index \p id */
-HWLOC_DECLSPEC int hwloc_bitmap_allbut(hwloc_bitmap_t bitmap, unsigned id);
-
-/** \brief Setup bitmap \p bitmap from unsigned long \p mask */
-HWLOC_DECLSPEC int hwloc_bitmap_from_ulong(hwloc_bitmap_t bitmap, unsigned long mask);
-
-/** \brief Setup bitmap \p bitmap from unsigned long \p mask used as \p i -th subset */
-HWLOC_DECLSPEC int hwloc_bitmap_from_ith_ulong(hwloc_bitmap_t bitmap, unsigned i, unsigned long mask);
-
-/** \brief Setup bitmap \p bitmap from unsigned longs \p masks used as first \p nr subsets */
-HWLOC_DECLSPEC int hwloc_bitmap_from_ulongs(hwloc_bitmap_t bitmap, unsigned nr, const unsigned long *masks);
-
-
-/*
- * Modifying bitmaps.
- */
-
-/** \brief Add index \p id in bitmap \p bitmap */
-HWLOC_DECLSPEC int hwloc_bitmap_set(hwloc_bitmap_t bitmap, unsigned id);
-
-/** \brief Add indexes from \p begin to \p end in bitmap \p bitmap.
- *
- * If \p end is \c -1, the range is infinite.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_set_range(hwloc_bitmap_t bitmap, unsigned begin, int end);
-
-/** \brief Replace \p i -th subset of bitmap \p bitmap with unsigned long \p mask */
-HWLOC_DECLSPEC int hwloc_bitmap_set_ith_ulong(hwloc_bitmap_t bitmap, unsigned i, unsigned long mask);
-
-/** \brief Remove index \p id from bitmap \p bitmap */
-HWLOC_DECLSPEC int hwloc_bitmap_clr(hwloc_bitmap_t bitmap, unsigned id);
-
-/** \brief Remove indexes from \p begin to \p end in bitmap \p bitmap.
- *
- * If \p end is \c -1, the range is infinite.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_clr_range(hwloc_bitmap_t bitmap, unsigned begin, int end);
-
-/** \brief Keep a single index among those set in bitmap \p bitmap
- *
- * May be useful before binding so that the process does not
- * have a chance of migrating between multiple logical CPUs
- * in the original mask.
- * Instead of running the task on any PU inside the given CPU set,
- * the operating system scheduler will be forced to run it on a single
- * of these PUs.
- * It avoids a migration overhead and cache-line ping-pongs between PUs.
- *
- * \note This function is NOT meant to distribute multiple processes
- * within a single CPU set. It always return the same single bit when
- * called multiple times on the same input set. hwloc_distrib() may
- * be used for generating CPU sets to distribute multiple tasks below
- * a single multi-PU object.
- *
- * \note This function cannot be applied to an object set directly. It
- * should be applied to a copy (which may be obtained with hwloc_bitmap_dup()).
- */
-HWLOC_DECLSPEC int hwloc_bitmap_singlify(hwloc_bitmap_t bitmap);
-
-
-/*
- * Consulting bitmaps.
- */
-
-/** \brief Convert the beginning part of bitmap \p bitmap into unsigned long \p mask */
-HWLOC_DECLSPEC unsigned long hwloc_bitmap_to_ulong(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
-
-/** \brief Convert the \p i -th subset of bitmap \p bitmap into unsigned long mask */
-HWLOC_DECLSPEC unsigned long hwloc_bitmap_to_ith_ulong(hwloc_const_bitmap_t bitmap, unsigned i) __hwloc_attribute_pure;
-
-/** \brief Convert the first \p nr subsets of bitmap \p bitmap into the array of \p nr unsigned long \p masks
- *
- * \p nr may be determined earlier with hwloc_bitmap_nr_ulongs().
- *
- * \return 0
- */
-HWLOC_DECLSPEC int hwloc_bitmap_to_ulongs(hwloc_const_bitmap_t bitmap, unsigned nr, unsigned long *masks);
-
-/** \brief Return the number of unsigned longs required for storing bitmap \p bitmap entirely
- *
- * This is the number of contiguous unsigned longs from the very first bit of the bitmap
- * (even if unset) up to the last set bit.
- * This is useful for knowing the \p nr parameter to pass to hwloc_bitmap_to_ulongs()
- * (or which calls to hwloc_bitmap_to_ith_ulong() are needed)
- * to entirely convert a bitmap into multiple unsigned longs.
- *
- * When called on the output of hwloc_topology_get_topology_cpuset(),
- * the returned number is large enough for all cpusets of the topology.
- *
- * \return -1 if \p bitmap is infinite.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_nr_ulongs(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
-
-/** \brief Test whether index \p id is part of bitmap \p bitmap.
- *
- * \return 1 if the bit at index \p id is set in bitmap \p bitmap, 0 otherwise.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_isset(hwloc_const_bitmap_t bitmap, unsigned id) __hwloc_attribute_pure;
-
-/** \brief Test whether bitmap \p bitmap is empty
- *
- * \return 1 if bitmap is empty, 0 otherwise.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_iszero(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
-
-/** \brief Test whether bitmap \p bitmap is completely full
- *
- * \return 1 if bitmap is full, 0 otherwise.
- *
- * \note A full bitmap is always infinitely set.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_isfull(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
-
-/** \brief Compute the first index (least significant bit) in bitmap \p bitmap
- *
- * \return -1 if no index is set in \p bitmap.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_first(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
-
-/** \brief Compute the next index in bitmap \p bitmap which is after index \p prev
- *
- * If \p prev is -1, the first index is returned.
- *
- * \return -1 if no index with higher index is set in \p bitmap.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_next(hwloc_const_bitmap_t bitmap, int prev) __hwloc_attribute_pure;
-
-/** \brief Compute the last index (most significant bit) in bitmap \p bitmap
- *
- * \return -1 if no index is set in \p bitmap, or if \p bitmap is infinitely set.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_last(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
-
-/** \brief Compute the "weight" of bitmap \p bitmap (i.e., number of
- * indexes that are in the bitmap).
- *
- * \return the number of indexes that are in the bitmap.
- *
- * \return -1 if \p bitmap is infinitely set.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_weight(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
-
-/** \brief Compute the first unset index (least significant bit) in bitmap \p bitmap
- *
- * \return -1 if no index is unset in \p bitmap.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_first_unset(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
-
-/** \brief Compute the next unset index in bitmap \p bitmap which is after index \p prev
- *
- * If \p prev is -1, the first unset index is returned.
- *
- * \return -1 if no index with higher index is unset in \p bitmap.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_next_unset(hwloc_const_bitmap_t bitmap, int prev) __hwloc_attribute_pure;
-
-/** \brief Compute the last unset index (most significant bit) in bitmap \p bitmap
- *
- * \return -1 if no index is unset in \p bitmap, or if \p bitmap is infinitely set.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_last_unset(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
-
-/** \brief Loop macro iterating on bitmap \p bitmap
- *
- * The loop must start with hwloc_bitmap_foreach_begin() and end
- * with hwloc_bitmap_foreach_end() followed by a terminating ';'.
- *
- * \p index is the loop variable; it should be an unsigned int.  The
- * first iteration will set \p index to the lowest index in the bitmap.
- * Successive iterations will iterate through, in order, all remaining
- * indexes set in the bitmap.  To be specific: each iteration will return a
- * value for \p index such that hwloc_bitmap_isset(bitmap, index) is true.
- *
- * The assert prevents the loop from being infinite if the bitmap is infinitely set.
- *
- * \hideinitializer
- */
-#define hwloc_bitmap_foreach_begin(id, bitmap) \
-do { \
-        assert(hwloc_bitmap_weight(bitmap) != -1); \
-        for (id = hwloc_bitmap_first(bitmap); \
-             (unsigned) id != (unsigned) -1; \
-             id = hwloc_bitmap_next(bitmap, id)) {
-
-/** \brief End of loop macro iterating on a bitmap.
- *
- * Needs a terminating ';'.
- *
- * \sa hwloc_bitmap_foreach_begin()
- * \hideinitializer
- */
-#define hwloc_bitmap_foreach_end()		\
-        } \
-} while (0)
-
-
-/*
- * Combining bitmaps.
- */
-
-/** \brief Or bitmaps \p bitmap1 and \p bitmap2 and store the result in bitmap \p res
- *
- * \p res can be the same as \p bitmap1 or \p bitmap2
- */
-HWLOC_DECLSPEC int hwloc_bitmap_or (hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2);
-
-/** \brief And bitmaps \p bitmap1 and \p bitmap2 and store the result in bitmap \p res
- *
- * \p res can be the same as \p bitmap1 or \p bitmap2
- */
-HWLOC_DECLSPEC int hwloc_bitmap_and (hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2);
-
-/** \brief And bitmap \p bitmap1 and the negation of \p bitmap2 and store the result in bitmap \p res
- *
- * \p res can be the same as \p bitmap1 or \p bitmap2
- */
-HWLOC_DECLSPEC int hwloc_bitmap_andnot (hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2);
-
-/** \brief Xor bitmaps \p bitmap1 and \p bitmap2 and store the result in bitmap \p res
- *
- * \p res can be the same as \p bitmap1 or \p bitmap2
- */
-HWLOC_DECLSPEC int hwloc_bitmap_xor (hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2);
-
-/** \brief Negate bitmap \p bitmap and store the result in bitmap \p res
- *
- * \p res can be the same as \p bitmap
- */
-HWLOC_DECLSPEC int hwloc_bitmap_not (hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap);
-
-
-/*
- * Comparing bitmaps.
- */
-
-/** \brief Test whether bitmaps \p bitmap1 and \p bitmap2 intersects.
- *
- * \return 1 if bitmaps intersect, 0 otherwise.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_intersects (hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) __hwloc_attribute_pure;
-
-/** \brief Test whether bitmap \p sub_bitmap is part of bitmap \p super_bitmap.
- *
- * \return 1 if \p sub_bitmap is included in \p super_bitmap, 0 otherwise.
- *
- * \note The empty bitmap is considered included in any other bitmap.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_isincluded (hwloc_const_bitmap_t sub_bitmap, hwloc_const_bitmap_t super_bitmap) __hwloc_attribute_pure;
-
-/** \brief Test whether bitmap \p bitmap1 is equal to bitmap \p bitmap2.
- *
- * \return 1 if bitmaps are equal, 0 otherwise.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_isequal (hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) __hwloc_attribute_pure;
-
-/** \brief Compare bitmaps \p bitmap1 and \p bitmap2 using their lowest index.
- *
- * A bitmap is considered smaller if its least significant bit is smaller.
- * The empty bitmap is considered higher than anything (because its least significant bit does not exist).
- *
- * \return -1 if \p bitmap1 is considered smaller than \p bitmap2.
- * \return 1 if \p bitmap1 is considered larger than \p bitmap2.
- *
- * For instance comparing binary bitmaps 0011 and 0110 returns -1
- * (hence 0011 is considered smaller than 0110)
- * because least significant bit of 0011 (0001) is smaller than least significant bit of 0110 (0010).
- * Comparing 01001 and 00110 would also return -1 for the same reason.
- *
- * \return 0 if bitmaps are considered equal, even if they are not strictly equal.
- * They just need to have the same least significant bit.
- * For instance, comparing binary bitmaps 0010 and 0110 returns 0 because they have the same least significant bit.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_compare_first(hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) __hwloc_attribute_pure;
-
-/** \brief Compare bitmaps \p bitmap1 and \p bitmap2 in lexicographic order.
- *
- * Lexicographic comparison of bitmaps, starting for their highest indexes.
- * Compare last indexes first, then second, etc.
- * The empty bitmap is considered lower than anything.
- *
- * \return -1 if \p bitmap1 is considered smaller than \p bitmap2.
- * \return 1 if \p bitmap1 is considered larger than \p bitmap2.
- * \return 0 if bitmaps are equal (contrary to hwloc_bitmap_compare_first()).
- *
- * For instance comparing binary bitmaps 0011 and 0110 returns -1
- * (hence 0011 is considered smaller than 0110).
- * Comparing 00101 and 01010 returns -1 too.
- *
- * \note This is different from the non-existing hwloc_bitmap_compare_last()
- * which would only compare the highest index of each bitmap.
- */
-HWLOC_DECLSPEC int hwloc_bitmap_compare(hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) __hwloc_attribute_pure;
-
-/** @} */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* HWLOC_BITMAP_H */
--- a/src/3rdparty/hwloc/include/hwloc/cuda.h
+++ b/src/3rdparty/hwloc/include/hwloc/cuda.h
@@ -1,220 +0,0 @@
-/*
- * Copyright © 2010-2017 Inria.  All rights reserved.
- * Copyright © 2010-2011 Université Bordeaux
- * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
- * See COPYING in top-level directory.
- */
-
-/** \file
- * \brief Macros to help interaction between hwloc and the CUDA Driver API.
- *
- * Applications that use both hwloc and the CUDA Driver API may want to
- * include this file so as to get topology information for CUDA devices.
- *
- */
-
-#ifndef HWLOC_CUDA_H
-#define HWLOC_CUDA_H
-
-#include "hwloc.h"
-#include "hwloc/autogen/config.h"
-#include "hwloc/helper.h"
-#ifdef HWLOC_LINUX_SYS
-#include "hwloc/linux.h"
-#endif
-
-#include <cuda.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** \defgroup hwlocality_cuda Interoperability with the CUDA Driver API
- *
- * This interface offers ways to retrieve topology information about
- * CUDA devices when using the CUDA Driver API.
- *
- * @{
- */
-
-/** \brief Return the domain, bus and device IDs of the CUDA device \p cudevice.
- *
- * Device \p cudevice must match the local machine.
- */
-static __hwloc_inline int
-hwloc_cuda_get_device_pci_ids(hwloc_topology_t topology __hwloc_attribute_unused,
-			      CUdevice cudevice, int *domain, int *bus, int *dev)
-{
-  CUresult cres;
-
-#if CUDA_VERSION >= 4000
-  cres = cuDeviceGetAttribute(domain, CU_DEVICE_ATTRIBUTE_PCI_DOMAIN_ID, cudevice);
-  if (cres != CUDA_SUCCESS) {
-    errno = ENOSYS;
-    return -1;
-  }
-#else
-  *domain = 0;
-#endif
-  cres = cuDeviceGetAttribute(bus, CU_DEVICE_ATTRIBUTE_PCI_BUS_ID, cudevice);
-  if (cres != CUDA_SUCCESS) {
-    errno = ENOSYS;
-    return -1;
-  }
-  cres = cuDeviceGetAttribute(dev, CU_DEVICE_ATTRIBUTE_PCI_DEVICE_ID, cudevice);
-  if (cres != CUDA_SUCCESS) {
-    errno = ENOSYS;
-    return -1;
-  }
-
-  return 0;
-}
-
-/** \brief Get the CPU set of logical processors that are physically
- * close to device \p cudevice.
- *
- * Return the CPU set describing the locality of the CUDA device \p cudevice.
- *
- * Topology \p topology and device \p cudevice must match the local machine.
- * I/O devices detection and the CUDA component are not needed in the topology.
- *
- * The function only returns the locality of the device.
- * If more information about the device is needed, OS objects should
- * be used instead, see hwloc_cuda_get_device_osdev()
- * and hwloc_cuda_get_device_osdev_by_index().
- *
- * This function is currently only implemented in a meaningful way for
- * Linux; other systems will simply get a full cpuset.
- */
-static __hwloc_inline int
-hwloc_cuda_get_device_cpuset(hwloc_topology_t topology __hwloc_attribute_unused,
-			     CUdevice cudevice, hwloc_cpuset_t set)
-{
-#ifdef HWLOC_LINUX_SYS
-  /* If we're on Linux, use the sysfs mechanism to get the local cpus */
-#define HWLOC_CUDA_DEVICE_SYSFS_PATH_MAX 128
-  char path[HWLOC_CUDA_DEVICE_SYSFS_PATH_MAX];
-  int domainid, busid, deviceid;
-
-  if (hwloc_cuda_get_device_pci_ids(topology, cudevice, &domainid, &busid, &deviceid))
-    return -1;
-
-  if (!hwloc_topology_is_thissystem(topology)) {
-    errno = EINVAL;
-    return -1;
-  }
-
-  sprintf(path, "/sys/bus/pci/devices/%04x:%02x:%02x.0/local_cpus", domainid, busid, deviceid);
-  if (hwloc_linux_read_path_as_cpumask(path, set) < 0
-      || hwloc_bitmap_iszero(set))
-    hwloc_bitmap_copy(set, hwloc_topology_get_complete_cpuset(topology));
-#else
-  /* Non-Linux systems simply get a full cpuset */
-  hwloc_bitmap_copy(set, hwloc_topology_get_complete_cpuset(topology));
-#endif
-  return 0;
-}
-
-/** \brief Get the hwloc PCI device object corresponding to the
- * CUDA device \p cudevice.
- *
- * Return the PCI device object describing the CUDA device \p cudevice.
- * Return NULL if there is none.
- *
- * Topology \p topology and device \p cudevice must match the local machine.
- * I/O devices detection must be enabled in topology \p topology.
- * The CUDA component is not needed in the topology.
- */
-static __hwloc_inline hwloc_obj_t
-hwloc_cuda_get_device_pcidev(hwloc_topology_t topology, CUdevice cudevice)
-{
-  int domain, bus, dev;
-
-  if (hwloc_cuda_get_device_pci_ids(topology, cudevice, &domain, &bus, &dev))
-    return NULL;
-
-  return hwloc_get_pcidev_by_busid(topology, domain, bus, dev, 0);
-}
-
-/** \brief Get the hwloc OS device object corresponding to CUDA device \p cudevice.
- *
- * Return the hwloc OS device object that describes the given
- * CUDA device \p cudevice. Return NULL if there is none.
- *
- * Topology \p topology and device \p cudevice must match the local machine.
- * I/O devices detection and the CUDA component must be enabled in the topology.
- * If not, the locality of the object may still be found using
- * hwloc_cuda_get_device_cpuset().
- *
- * \note This function cannot work if PCI devices are filtered out.
- *
- * \note The corresponding hwloc PCI device may be found by looking
- * at the result parent pointer (unless PCI devices are filtered out).
- */
-static __hwloc_inline hwloc_obj_t
-hwloc_cuda_get_device_osdev(hwloc_topology_t topology, CUdevice cudevice)
-{
-	hwloc_obj_t osdev = NULL;
-	int domain, bus, dev;
-
-	if (hwloc_cuda_get_device_pci_ids(topology, cudevice, &domain, &bus, &dev))
-		return NULL;
-
-	osdev = NULL;
-	while ((osdev = hwloc_get_next_osdev(topology, osdev)) != NULL) {
-		hwloc_obj_t pcidev = osdev->parent;
-		if (strncmp(osdev->name, "cuda", 4))
-			continue;
-		if (pcidev
-		    && pcidev->type == HWLOC_OBJ_PCI_DEVICE
-		    && (int) pcidev->attr->pcidev.domain == domain
-		    && (int) pcidev->attr->pcidev.bus == bus
-		    && (int) pcidev->attr->pcidev.dev == dev
-		    && pcidev->attr->pcidev.func == 0)
-			return osdev;
-		/* if PCI are filtered out, we need a info attr to match on */
-	}
-
-	return NULL;
-}
-
-/** \brief Get the hwloc OS device object corresponding to the
- * CUDA device whose index is \p idx.
- *
- * Return the OS device object describing the CUDA device whose
- * index is \p idx. Return NULL if there is none.
- *
- * The topology \p topology does not necessarily have to match the current
- * machine. For instance the topology may be an XML import of a remote host.
- * I/O devices detection and the CUDA component must be enabled in the topology.
- *
- * \note The corresponding PCI device object can be obtained by looking
- * at the OS device parent object (unless PCI devices are filtered out).
- *
- * \note This function is identical to hwloc_cudart_get_device_osdev_by_index().
- */
-static __hwloc_inline hwloc_obj_t
-hwloc_cuda_get_device_osdev_by_index(hwloc_topology_t topology, unsigned idx)
-{
-	hwloc_obj_t osdev = NULL;
-	while ((osdev = hwloc_get_next_osdev(topology, osdev)) != NULL) {
-		if (HWLOC_OBJ_OSDEV_COPROC == osdev->attr->osdev.type
-		    && osdev->name
-		    && !strncmp("cuda", osdev->name, 4)
-		    && atoi(osdev->name + 4) == (int) idx)
-			return osdev;
-	}
-	return NULL;
-}
-
-/** @} */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* HWLOC_CUDA_H */
--- a/src/3rdparty/hwloc/include/hwloc/cudart.h
+++ b/src/3rdparty/hwloc/include/hwloc/cudart.h
@@ -1,177 +0,0 @@
-/*
- * Copyright © 2010-2017 Inria.  All rights reserved.
- * Copyright © 2010-2011 Université Bordeaux
- * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
- * See COPYING in top-level directory.
- */
-
-/** \file
- * \brief Macros to help interaction between hwloc and the CUDA Runtime API.
- *
- * Applications that use both hwloc and the CUDA Runtime API may want to
- * include this file so as to get topology information for CUDA devices.
- *
- */
-
-#ifndef HWLOC_CUDART_H
-#define HWLOC_CUDART_H
-
-#include "hwloc.h"
-#include "hwloc/autogen/config.h"
-#include "hwloc/helper.h"
-#ifdef HWLOC_LINUX_SYS
-#include "hwloc/linux.h"
-#endif
-
-#include <cuda.h> /* for CUDA_VERSION */
-#include <cuda_runtime_api.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** \defgroup hwlocality_cudart Interoperability with the CUDA Runtime API
- *
- * This interface offers ways to retrieve topology information about
- * CUDA devices when using the CUDA Runtime API.
- *
- * @{
- */
-
-/** \brief Return the domain, bus and device IDs of the CUDA device whose index is \p idx.
- *
- * Device index \p idx must match the local machine.
- */
-static __hwloc_inline int
-hwloc_cudart_get_device_pci_ids(hwloc_topology_t topology __hwloc_attribute_unused,
-				int idx, int *domain, int *bus, int *dev)
-{
-  cudaError_t cerr;
-  struct cudaDeviceProp prop;
-
-  cerr = cudaGetDeviceProperties(&prop, idx);
-  if (cerr) {
-    errno = ENOSYS;
-    return -1;
-  }
-
-#if CUDA_VERSION >= 4000
-  *domain = prop.pciDomainID;
-#else
-  *domain = 0;
-#endif
-
-  *bus = prop.pciBusID;
-  *dev = prop.pciDeviceID;
-
-  return 0;
-}
-
-/** \brief Get the CPU set of logical processors that are physically
- * close to device \p idx.
- *
- * Return the CPU set describing the locality of the CUDA device
- * whose index is \p idx.
- *
- * Topology \p topology and device \p idx must match the local machine.
- * I/O devices detection and the CUDA component are not needed in the topology.
- *
- * The function only returns the locality of the device.
- * If more information about the device is needed, OS objects should
- * be used instead, see hwloc_cudart_get_device_osdev_by_index().
- *
- * This function is currently only implemented in a meaningful way for
- * Linux; other systems will simply get a full cpuset.
- */
-static __hwloc_inline int
-hwloc_cudart_get_device_cpuset(hwloc_topology_t topology __hwloc_attribute_unused,
-			       int idx, hwloc_cpuset_t set)
-{
-#ifdef HWLOC_LINUX_SYS
-  /* If we're on Linux, use the sysfs mechanism to get the local cpus */
-#define HWLOC_CUDART_DEVICE_SYSFS_PATH_MAX 128
-  char path[HWLOC_CUDART_DEVICE_SYSFS_PATH_MAX];
-  int domain, bus, dev;
-
-  if (hwloc_cudart_get_device_pci_ids(topology, idx, &domain, &bus, &dev))
-    return -1;
-
-  if (!hwloc_topology_is_thissystem(topology)) {
-    errno = EINVAL;
-    return -1;
-  }
-
-  sprintf(path, "/sys/bus/pci/devices/%04x:%02x:%02x.0/local_cpus", (unsigned) domain, (unsigned) bus, (unsigned) dev);
-  if (hwloc_linux_read_path_as_cpumask(path, set) < 0
-      || hwloc_bitmap_iszero(set))
-    hwloc_bitmap_copy(set, hwloc_topology_get_complete_cpuset(topology));
-#else
-  /* Non-Linux systems simply get a full cpuset */
-  hwloc_bitmap_copy(set, hwloc_topology_get_complete_cpuset(topology));
-#endif
-  return 0;
-}
-
-/** \brief Get the hwloc PCI device object corresponding to the
- * CUDA device whose index is \p idx.
- *
- * Return the PCI device object describing the CUDA device whose
- * index is \p idx. Return NULL if there is none.
- *
- * Topology \p topology and device \p idx must match the local machine.
- * I/O devices detection must be enabled in topology \p topology.
- * The CUDA component is not needed in the topology.
- */
-static __hwloc_inline hwloc_obj_t
-hwloc_cudart_get_device_pcidev(hwloc_topology_t topology, int idx)
-{
-  int domain, bus, dev;
-
-  if (hwloc_cudart_get_device_pci_ids(topology, idx, &domain, &bus, &dev))
-    return NULL;
-
-  return hwloc_get_pcidev_by_busid(topology, domain, bus, dev, 0);
-}
-
-/** \brief Get the hwloc OS device object corresponding to the
- * CUDA device whose index is \p idx.
- *
- * Return the OS device object describing the CUDA device whose
- * index is \p idx. Return NULL if there is none.
- *
- * The topology \p topology does not necessarily have to match the current
- * machine. For instance the topology may be an XML import of a remote host.
- * I/O devices detection and the CUDA component must be enabled in the topology.
- * If not, the locality of the object may still be found using
- * hwloc_cudart_get_device_cpuset().
- *
- * \note The corresponding PCI device object can be obtained by looking
- * at the OS device parent object (unless PCI devices are filtered out).
- *
- * \note This function is identical to hwloc_cuda_get_device_osdev_by_index().
- */
-static __hwloc_inline hwloc_obj_t
-hwloc_cudart_get_device_osdev_by_index(hwloc_topology_t topology, unsigned idx)
-{
-	hwloc_obj_t osdev = NULL;
-	while ((osdev = hwloc_get_next_osdev(topology, osdev)) != NULL) {
-		if (HWLOC_OBJ_OSDEV_COPROC == osdev->attr->osdev.type
-		    && osdev->name
-		    && !strncmp("cuda", osdev->name, 4)
-		    && atoi(osdev->name + 4) == (int) idx)
-			return osdev;
-	}
-	return NULL;
-}
-
-/** @} */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* HWLOC_CUDART_H */
--- a/src/3rdparty/hwloc/include/hwloc/deprecated.h
+++ b/src/3rdparty/hwloc/include/hwloc/deprecated.h
@@ -1,208 +0,0 @@
-/*
- * Copyright © 2009 CNRS
- * Copyright © 2009-2018 Inria.  All rights reserved.
- * Copyright © 2009-2012 Université Bordeaux
- * Copyright © 2009-2010 Cisco Systems, Inc.  All rights reserved.
- * See COPYING in top-level directory.
- */
-
-/**
- * This file contains the inline code of functions declared in hwloc.h
- */
-
-#ifndef HWLOC_DEPRECATED_H
-#define HWLOC_DEPRECATED_H
-
-#ifndef HWLOC_H
-#error Please include the main hwloc.h instead
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* backward compat with v2.0 before WHOLE_SYSTEM renaming */
-#define HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM HWLOC_TOPOLOGY_FLAG_INCLUDE_DISALLOWED
-/* backward compat with v1.11 before System removal */
-#define HWLOC_OBJ_SYSTEM HWLOC_OBJ_MACHINE
-/* backward compat with v1.10 before Socket->Package renaming */
-#define HWLOC_OBJ_SOCKET HWLOC_OBJ_PACKAGE
-/* backward compat with v1.10 before Node->NUMANode clarification */
-#define HWLOC_OBJ_NODE HWLOC_OBJ_NUMANODE
-
-/** \brief Insert a misc object by parent.
- *
- * Identical to hwloc_topology_insert_misc_object().
- */
-static __hwloc_inline hwloc_obj_t
-hwloc_topology_insert_misc_object_by_parent(hwloc_topology_t topology, hwloc_obj_t parent, const char *name) __hwloc_attribute_deprecated;
-static __hwloc_inline hwloc_obj_t
-hwloc_topology_insert_misc_object_by_parent(hwloc_topology_t topology, hwloc_obj_t parent, const char *name)
-{
-  return hwloc_topology_insert_misc_object(topology, parent, name);
-}
-
-/** \brief Stringify the cpuset containing a set of objects.
- *
- * If \p size is 0, \p string may safely be \c NULL.
- *
- * \return the number of character that were actually written if not truncating,
- * or that would have been written (not including the ending \\0).
- */
-static __hwloc_inline int
-hwloc_obj_cpuset_snprintf(char *str, size_t size, size_t nobj, struct hwloc_obj * const *objs) __hwloc_attribute_deprecated;
-static __hwloc_inline int
-hwloc_obj_cpuset_snprintf(char *str, size_t size, size_t nobj, struct hwloc_obj * const *objs)
-{
-  hwloc_bitmap_t set = hwloc_bitmap_alloc();
-  int res;
-  unsigned i;
-
-  hwloc_bitmap_zero(set);
-  for(i=0; i<nobj; i++)
-    if (objs[i]->cpuset)
-      hwloc_bitmap_or(set, set, objs[i]->cpuset);
-
-  res = hwloc_bitmap_snprintf(str, size, set);
-  hwloc_bitmap_free(set);
-  return res;
-}
-
-/** \brief Convert a type string into a type and some attributes.
- *
- * Deprecated by hwloc_type_sscanf()
- */
-static __hwloc_inline int
-hwloc_obj_type_sscanf(const char *string, hwloc_obj_type_t *typep, int *depthattrp, void *typeattrp, size_t typeattrsize) __hwloc_attribute_deprecated;
-static __hwloc_inline int
-hwloc_obj_type_sscanf(const char *string, hwloc_obj_type_t *typep, int *depthattrp, void *typeattrp, size_t typeattrsize)
-{
-  union hwloc_obj_attr_u attr;
-  int err = hwloc_type_sscanf(string, typep, &attr, sizeof(attr));
-  if (err < 0)
-    return err;
-  if (hwloc_obj_type_is_cache(*typep)) {
-    if (depthattrp)
-      *depthattrp = (int) attr.cache.depth;
-    if (typeattrp && typeattrsize >= sizeof(hwloc_obj_cache_type_t))
-      memcpy(typeattrp, &attr.cache.type, sizeof(hwloc_obj_cache_type_t));
-  } else if (*typep == HWLOC_OBJ_GROUP) {
-    if (depthattrp)
-      *depthattrp = (int) attr.group.depth;
-  }
-  return 0;
-}
-
-/** \brief Set the default memory binding policy of the current
- * process or thread to prefer the NUMA node(s) specified by physical \p nodeset
- */
-static __hwloc_inline int
-hwloc_set_membind_nodeset(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags) __hwloc_attribute_deprecated;
-static __hwloc_inline int
-hwloc_set_membind_nodeset(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
-{
-  return hwloc_set_membind(topology, nodeset, policy, flags | HWLOC_MEMBIND_BYNODESET);
-}
-
-/** \brief Query the default memory binding policy and physical locality of the
- * current process or thread.
- */
-static __hwloc_inline int
-hwloc_get_membind_nodeset(hwloc_topology_t topology, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags) __hwloc_attribute_deprecated;
-static __hwloc_inline int
-hwloc_get_membind_nodeset(hwloc_topology_t topology, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags)
-{
-  return hwloc_get_membind(topology, nodeset, policy, flags | HWLOC_MEMBIND_BYNODESET);
-}
-
-/** \brief Set the default memory binding policy of the specified
- * process to prefer the NUMA node(s) specified by physical \p nodeset
- */
-static __hwloc_inline int
-hwloc_set_proc_membind_nodeset(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags) __hwloc_attribute_deprecated;
-static __hwloc_inline int
-hwloc_set_proc_membind_nodeset(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
-{
-  return hwloc_set_proc_membind(topology, pid, nodeset, policy, flags | HWLOC_MEMBIND_BYNODESET);
-}
-
-/** \brief Query the default memory binding policy and physical locality of the
- * specified process.
- */
-static __hwloc_inline int
-hwloc_get_proc_membind_nodeset(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags) __hwloc_attribute_deprecated;
-static __hwloc_inline int
-hwloc_get_proc_membind_nodeset(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags)
-{
-  return hwloc_get_proc_membind(topology, pid, nodeset, policy, flags | HWLOC_MEMBIND_BYNODESET);
-}
-
-/** \brief Bind the already-allocated memory identified by (addr, len)
- * to the NUMA node(s) in physical \p nodeset.
- */
-static __hwloc_inline int
-hwloc_set_area_membind_nodeset(hwloc_topology_t topology, const void *addr, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags) __hwloc_attribute_deprecated;
-static __hwloc_inline int
-hwloc_set_area_membind_nodeset(hwloc_topology_t topology, const void *addr, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
-{
-  return hwloc_set_area_membind(topology, addr, len, nodeset, policy, flags | HWLOC_MEMBIND_BYNODESET);
-}
-
-/** \brief Query the physical NUMA node(s) and binding policy of the memory
- * identified by (\p addr, \p len ).
- */
-static __hwloc_inline int
-hwloc_get_area_membind_nodeset(hwloc_topology_t topology, const void *addr, size_t len, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags) __hwloc_attribute_deprecated;
-static __hwloc_inline int
-hwloc_get_area_membind_nodeset(hwloc_topology_t topology, const void *addr, size_t len, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags)
-{
-  return hwloc_get_area_membind(topology, addr, len, nodeset, policy, flags | HWLOC_MEMBIND_BYNODESET);
-}
-
-/** \brief Allocate some memory on the given physical nodeset \p nodeset
- */
-static __hwloc_inline void *
-hwloc_alloc_membind_nodeset(hwloc_topology_t topology, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags) __hwloc_attribute_malloc __hwloc_attribute_deprecated;
-static __hwloc_inline void *
-hwloc_alloc_membind_nodeset(hwloc_topology_t topology, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
-{
-  return hwloc_alloc_membind(topology, len, nodeset, policy, flags | HWLOC_MEMBIND_BYNODESET);
-}
-
-/** \brief Allocate some memory on the given nodeset \p nodeset.
- */
-static __hwloc_inline void *
-hwloc_alloc_membind_policy_nodeset(hwloc_topology_t topology, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags) __hwloc_attribute_malloc __hwloc_attribute_deprecated;
-static __hwloc_inline void *
-hwloc_alloc_membind_policy_nodeset(hwloc_topology_t topology, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
-{
-  return hwloc_alloc_membind_policy(topology, len, nodeset, policy, flags | HWLOC_MEMBIND_BYNODESET);
-}
-
-/** \brief Convert a CPU set into a NUMA node set and handle non-NUMA cases
- */
-static __hwloc_inline void
-hwloc_cpuset_to_nodeset_strict(hwloc_topology_t topology, hwloc_const_cpuset_t _cpuset, hwloc_nodeset_t nodeset) __hwloc_attribute_deprecated;
-static __hwloc_inline void
-hwloc_cpuset_to_nodeset_strict(hwloc_topology_t topology, hwloc_const_cpuset_t _cpuset, hwloc_nodeset_t nodeset)
-{
-  hwloc_cpuset_to_nodeset(topology, _cpuset, nodeset);
-}
-
-/** \brief Convert a NUMA node set into a CPU set and handle non-NUMA cases
- */
-static __hwloc_inline void
-hwloc_cpuset_from_nodeset_strict(hwloc_topology_t topology, hwloc_cpuset_t _cpuset, hwloc_const_nodeset_t nodeset) __hwloc_attribute_deprecated;
-static __hwloc_inline void
-hwloc_cpuset_from_nodeset_strict(hwloc_topology_t topology, hwloc_cpuset_t _cpuset, hwloc_const_nodeset_t nodeset)
-{
-  hwloc_cpuset_from_nodeset(topology, _cpuset, nodeset);
-}
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* HWLOC_DEPRECATED_H */
--- a/src/3rdparty/hwloc/include/hwloc/diff.h
+++ b/src/3rdparty/hwloc/include/hwloc/diff.h
@@ -1,289 +0,0 @@
-/*
- * Copyright © 2013-2018 Inria.  All rights reserved.
- * See COPYING in top-level directory.
- */
-
-/** \file
- * \brief Topology differences.
- */
-
-#ifndef HWLOC_DIFF_H
-#define HWLOC_DIFF_H
-
-#ifndef HWLOC_H
-#error Please include the main hwloc.h instead
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#elif 0
-}
-#endif
-
-
-/** \defgroup hwlocality_diff Topology differences
- *
- * Applications that manipulate many similar topologies, for instance
- * one for each node of a homogeneous cluster, may want to compress
- * topologies to reduce the memory footprint.
- *
- * This file offers a way to manipulate the difference between topologies
- * and export/import it to/from XML.
- * Compression may therefore be achieved by storing one topology
- * entirely while the others are only described by their differences
- * with the former.
- * The actual topology can be reconstructed when actually needed by
- * applying the precomputed difference to the reference topology.
- *
- * This interface targets very similar nodes.
- * Only very simple differences between topologies are actually
- * supported, for instance a change in the memory size, the name
- * of the object, or some info attribute.
- * More complex differences such as adding or removing objects cannot
- * be represented in the difference structures and therefore return
- * errors.
- * Differences between object sets or topology-wide allowed sets,
- * cannot be represented either.
- *
- * It means that there is no need to apply the difference when
- * looking at the tree organization (how many levels, how many
- * objects per level, what kind of objects, CPU and node sets, etc)
- * and when binding to objects.
- * However the difference must be applied when looking at object
- * attributes such as the name, the memory size or info attributes.
- *
- * @{
- */
-
-
-/** \brief Type of one object attribute difference.
- */
-typedef enum hwloc_topology_diff_obj_attr_type_e {
-  /** \brief The object local memory is modified.
-   * The union is a hwloc_topology_diff_obj_attr_u::hwloc_topology_diff_obj_attr_uint64_s
-   * (and the index field is ignored).
-   */
-  HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_SIZE,
-
-  /** \brief The object name is modified.
-   * The union is a hwloc_topology_diff_obj_attr_u::hwloc_topology_diff_obj_attr_string_s
-   * (and the name field is ignored).
-   */
-
-  HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_NAME,
-  /** \brief the value of an info attribute is modified.
-   * The union is a hwloc_topology_diff_obj_attr_u::hwloc_topology_diff_obj_attr_string_s.
-   */
-  HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_INFO
-} hwloc_topology_diff_obj_attr_type_t;
-
-/** \brief One object attribute difference.
- */
-union hwloc_topology_diff_obj_attr_u {
-  struct hwloc_topology_diff_obj_attr_generic_s {
-    /* each part of the union must start with these */
-    hwloc_topology_diff_obj_attr_type_t type;
-  } generic;
-
-  /** \brief Integer attribute modification with an optional index. */
-  struct hwloc_topology_diff_obj_attr_uint64_s {
-    /* used for storing integer attributes */
-    hwloc_topology_diff_obj_attr_type_t type;
-    hwloc_uint64_t index; /* not used for SIZE */
-    hwloc_uint64_t oldvalue;
-    hwloc_uint64_t newvalue;
-  } uint64;
-
-  /** \brief String attribute modification with an optional name */
-  struct hwloc_topology_diff_obj_attr_string_s {
-    /* used for storing name and info pairs */
-    hwloc_topology_diff_obj_attr_type_t type;
-    char *name; /* not used for NAME */
-    char *oldvalue;
-    char *newvalue;
-  } string;
-};
-
-
-/** \brief Type of one element of a difference list.
- */
-typedef enum hwloc_topology_diff_type_e {
-  /** \brief An object attribute was changed.
-   * The union is a hwloc_topology_diff_obj_attr_u::hwloc_topology_diff_obj_attr_s.
-   */
-  HWLOC_TOPOLOGY_DIFF_OBJ_ATTR,
-
-  /** \brief The difference is too complex,
-   * it cannot be represented. The difference below
-   * this object has not been checked.
-   * hwloc_topology_diff_build() will return 1.
-   *
-   * The union is a hwloc_topology_diff_obj_attr_u::hwloc_topology_diff_too_complex_s.
-   */
-  HWLOC_TOPOLOGY_DIFF_TOO_COMPLEX
-} hwloc_topology_diff_type_t;
-
-/** \brief One element of a difference list between two topologies.
- */
-typedef union hwloc_topology_diff_u {
-  struct hwloc_topology_diff_generic_s {
-    /* each part of the union must start with these */
-    hwloc_topology_diff_type_t type;
-    union hwloc_topology_diff_u * next; /* pointer to the next element of the list, or NULL */
-  } generic;
-
-  /* A difference in an object attribute. */
-  struct hwloc_topology_diff_obj_attr_s {
-    hwloc_topology_diff_type_t type; /* must be ::HWLOC_TOPOLOGY_DIFF_OBJ_ATTR */
-    union hwloc_topology_diff_u * next;
-    /* List of attribute differences for a single object */
-    int obj_depth;
-    unsigned obj_index;
-    union hwloc_topology_diff_obj_attr_u diff;
-  } obj_attr;
-
-  /* A difference that is too complex. */
-  struct hwloc_topology_diff_too_complex_s {
-    hwloc_topology_diff_type_t type; /* must be ::HWLOC_TOPOLOGY_DIFF_TOO_COMPLEX */
-    union hwloc_topology_diff_u * next;
-    /* Where we had to stop computing the diff in the first topology */
-    int obj_depth;
-    unsigned obj_index;
-  } too_complex;
-} * hwloc_topology_diff_t;
-
-
-/** \brief Compute the difference between 2 topologies.
- *
- * The difference is stored as a list of ::hwloc_topology_diff_t entries
- * starting at \p diff.
- * It is computed by doing a depth-first traversal of both topology trees
- * simultaneously.
- *
- * If the difference between 2 objects is too complex to be represented
- * (for instance if some objects have different types, or different numbers
- * of children), a special diff entry of type ::HWLOC_TOPOLOGY_DIFF_TOO_COMPLEX
- * is queued.
- * The computation of the diff does not continue below these objects.
- * So each such diff entry means that the difference between two subtrees
- * could not be computed.
- *
- * \return 0 if the difference can be represented properly.
- *
- * \return 0 with \p diff pointing to NULL if there is no difference
- * between the topologies.
- *
- * \return 1 if the difference is too complex (see above). Some entries in
- * the list will be of type ::HWLOC_TOPOLOGY_DIFF_TOO_COMPLEX.
- *
- * \return -1 on any other error.
- *
- * \note \p flags is currently not used. It should be 0.
- *
- * \note The output diff has to be freed with hwloc_topology_diff_destroy().
- *
- * \note The output diff can only be exported to XML or passed to
- * hwloc_topology_diff_apply() if 0 was returned, i.e. if no entry of type
- * ::HWLOC_TOPOLOGY_DIFF_TOO_COMPLEX is listed.
- *
- * \note The output diff may be modified by removing some entries from
- * the list. The removed entries should be freed by passing them to
- * to hwloc_topology_diff_destroy() (possible as another list).
-*/
-HWLOC_DECLSPEC int hwloc_topology_diff_build(hwloc_topology_t topology, hwloc_topology_t newtopology, unsigned long flags, hwloc_topology_diff_t *diff);
-
-/** \brief Flags to be given to hwloc_topology_diff_apply().
- */
-enum hwloc_topology_diff_apply_flags_e {
-  /** \brief Apply topology diff in reverse direction.
-   * \hideinitializer
-   */
-  HWLOC_TOPOLOGY_DIFF_APPLY_REVERSE = (1UL<<0)
-};
-
-/** \brief Apply a topology diff to an existing topology.
- *
- * \p flags is an OR'ed set of ::hwloc_topology_diff_apply_flags_e.
- *
- * The new topology is modified in place. hwloc_topology_dup()
- * may be used to duplicate it before patching.
- *
- * If the difference cannot be applied entirely, all previous applied
- * elements are unapplied before returning.
- *
- * \return 0 on success.
- *
- * \return -N if applying the difference failed while trying
- * to apply the N-th part of the difference. For instance -1
- * is returned if the very first difference element could not
- * be applied.
- */
-HWLOC_DECLSPEC int hwloc_topology_diff_apply(hwloc_topology_t topology, hwloc_topology_diff_t diff, unsigned long flags);
-
-/** \brief Destroy a list of topology differences.
- */
-HWLOC_DECLSPEC int hwloc_topology_diff_destroy(hwloc_topology_diff_t diff);
-
-/** \brief Load a list of topology differences from a XML file.
- *
- * If not \c NULL, \p refname will be filled with the identifier
- * string of the reference topology for the difference file,
- * if any was specified in the XML file.
- * This identifier is usually the name of the other XML file
- * that contains the reference topology.
- *
- * \note the pointer returned in refname should later be freed
- * by the caller.
- */
-HWLOC_DECLSPEC int hwloc_topology_diff_load_xml(const char *xmlpath, hwloc_topology_diff_t *diff, char **refname);
-
-/** \brief Export a list of topology differences to a XML file.
- *
- * If not \c NULL, \p refname defines an identifier string
- * for the reference topology which was used as a base when
- * computing this difference.
- * This identifier is usually the name of the other XML file
- * that contains the reference topology.
- * This attribute is given back when reading the diff from XML.
- */
-HWLOC_DECLSPEC int hwloc_topology_diff_export_xml(hwloc_topology_diff_t diff, const char *refname, const char *xmlpath);
-
-/** \brief Load a list of topology differences from a XML buffer.
- *
- * If not \c NULL, \p refname will be filled with the identifier
- * string of the reference topology for the difference file,
- * if any was specified in the XML file.
- * This identifier is usually the name of the other XML file
- * that contains the reference topology.
- *
- * \note the pointer returned in refname should later be freed
- * by the caller.
-  */
-HWLOC_DECLSPEC int hwloc_topology_diff_load_xmlbuffer(const char *xmlbuffer, int buflen, hwloc_topology_diff_t *diff, char **refname);
-
-/** \brief Export a list of topology differences to a XML buffer.
- *
- * If not \c NULL, \p refname defines an identifier string
- * for the reference topology which was used as a base when
- * computing this difference.
- * This identifier is usually the name of the other XML file
- * that contains the reference topology.
- * This attribute is given back when reading the diff from XML.
- *
- * The returned buffer ends with a \0 that is included in the returned
- * length.
- *
- * \note The XML buffer should later be freed with hwloc_free_xmlbuffer().
- */
-HWLOC_DECLSPEC int hwloc_topology_diff_export_xmlbuffer(hwloc_topology_diff_t diff, const char *refname, char **xmlbuffer, int *buflen);
-
-/** @} */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* HWLOC_DIFF_H */
--- a/src/3rdparty/hwloc/include/hwloc/distances.h
+++ b/src/3rdparty/hwloc/include/hwloc/distances.h
@@ -1,294 +0,0 @@
-/*
- * Copyright © 2010-2019 Inria.  All rights reserved.
- * See COPYING in top-level directory.
- */
-
-/** \file
- * \brief Object distances.
- */
-
-#ifndef HWLOC_DISTANCES_H
-#define HWLOC_DISTANCES_H
-
-#ifndef HWLOC_H
-#error Please include the main hwloc.h instead
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#elif 0
-}
-#endif
-
-
-/** \defgroup hwlocality_distances_get Retrieve distances between objects
- * @{
- */
-
-/** \brief Matrix of distances between a set of objects.
- *
- * This matrix often contains latencies between NUMA nodes
- * (as reported in the System Locality Distance Information Table (SLIT)
- * in the ACPI specification), which may or may not be physically accurate.
- * It corresponds to the latency for accessing the memory of one node
- * from a core in another node.
- * The corresponding kind is ::HWLOC_DISTANCES_KIND_FROM_OS | ::HWLOC_DISTANCES_KIND_FROM_USER.
- *
- * The matrix may also contain bandwidths between random sets of objects,
- * possibly provided by the user, as specified in the \p kind attribute.
- */
-struct hwloc_distances_s {
-  unsigned nbobjs;		/**< \brief Number of objects described by the distance matrix. */
-  hwloc_obj_t *objs;		/**< \brief Array of objects described by the distance matrix.
-				 * These objects are not in any particular order,
-				 * see hwloc_distances_obj_index() and hwloc_distances_obj_pair_values()
-				 * for easy ways to find objects in this array and their corresponding values.
-				 */
-  unsigned long kind;		/**< \brief OR'ed set of ::hwloc_distances_kind_e. */
-  hwloc_uint64_t *values;	/**< \brief Matrix of distances between objects, stored as a one-dimension array.
-				 *
-				 * Distance from i-th to j-th object is stored in slot i*nbobjs+j.
-				 * The meaning of the value depends on the \p kind attribute.
-				 */
-};
-
-/** \brief Kinds of distance matrices.
- *
- * The \p kind attribute of struct hwloc_distances_s is a OR'ed set
- * of kinds.
- *
- * A kind of format HWLOC_DISTANCES_KIND_FROM_* specifies where the
- * distance information comes from, if known.
- *
- * A kind of format HWLOC_DISTANCES_KIND_MEANS_* specifies whether
- * values are latencies or bandwidths, if applicable.
- */
-enum hwloc_distances_kind_e {
-  /** \brief These distances were obtained from the operating system or hardware.
-   * \hideinitializer
-   */
-  HWLOC_DISTANCES_KIND_FROM_OS = (1UL<<0),
-  /** \brief These distances were provided by the user.
-   * \hideinitializer
-   */
-  HWLOC_DISTANCES_KIND_FROM_USER = (1UL<<1),
-
-  /** \brief Distance values are similar to latencies between objects.
-   * Values are smaller for closer objects, hence minimal on the diagonal
-   * of the matrix (distance between an object and itself).
-   * It could also be the number of network hops between objects, etc.
-   * \hideinitializer
-   */
-  HWLOC_DISTANCES_KIND_MEANS_LATENCY = (1UL<<2),
-  /** \brief Distance values are similar to bandwidths between objects.
-   * Values are higher for closer objects, hence maximal on the diagonal
-   * of the matrix (distance between an object and itself).
-   * Such values are currently ignored for distance-based grouping.
-   * \hideinitializer
-   */
-  HWLOC_DISTANCES_KIND_MEANS_BANDWIDTH = (1UL<<3),
-
-  /** \brief This distances structure covers objects of different types.
-   * \hideinitializer
-   */
-  HWLOC_DISTANCES_KIND_HETEROGENEOUS_TYPES = (1UL<<4)
-};
-
-/** \brief Retrieve distance matrices.
- *
- * Retrieve distance matrices from the topology into the \p distances array.
- *
- * \p flags is currently unused, should be \c 0.
- *
- * \p kind serves as a filter. If \c 0, all distance matrices are returned.
- * If it contains some HWLOC_DISTANCES_KIND_FROM_*, only distance matrices
- * whose kind matches one of these are returned.
- * If it contains some HWLOC_DISTANCES_KIND_MEANS_*, only distance matrices
- * whose kind matches one of these are returned.
- *
- * On input, \p nr points to the number of distance matrices that may be stored
- * in \p distances.
- * On output, \p nr points to the number of distance matrices that were actually
- * found, even if some of them couldn't be stored in \p distances.
- * Distance matrices that couldn't be stored are ignored, but the function still
- * returns success (\c 0). The caller may find out by comparing the value pointed
- * by \p nr before and after the function call.
- *
- * Each distance matrix returned in the \p distances array should be released
- * by the caller using hwloc_distances_release().
- */
-HWLOC_DECLSPEC int
-hwloc_distances_get(hwloc_topology_t topology,
-		    unsigned *nr, struct hwloc_distances_s **distances,
-		    unsigned long kind, unsigned long flags);
-
-/** \brief Retrieve distance matrices for object at a specific depth in the topology.
- *
- * Identical to hwloc_distances_get() with the additional \p depth filter.
- */
-HWLOC_DECLSPEC int
-hwloc_distances_get_by_depth(hwloc_topology_t topology, int depth,
-			     unsigned *nr, struct hwloc_distances_s **distances,
-			     unsigned long kind, unsigned long flags);
-
-/** \brief Retrieve distance matrices for object of a specific type.
- *
- * Identical to hwloc_distances_get() with the additional \p type filter.
- */
-HWLOC_DECLSPEC int
-hwloc_distances_get_by_type(hwloc_topology_t topology, hwloc_obj_type_t type,
-			    unsigned *nr, struct hwloc_distances_s **distances,
-			    unsigned long kind, unsigned long flags);
-
-/** \brief Retrieve a distance matrix with the given name.
- *
- * Usually only one distances structure may match a given name.
- */
-HWLOC_DECLSPEC int
-hwloc_distances_get_by_name(hwloc_topology_t topology, const char *name,
-			    unsigned *nr, struct hwloc_distances_s **distances,
-			    unsigned long flags);
-
-/** \brief Get a description of what a distances structure contains.
- *
- * For instance "NUMALatency" for hardware-provided NUMA distances (ACPI SLIT),
- * or NULL if unknown.
- */
-HWLOC_DECLSPEC const char *
-hwloc_distances_get_name(hwloc_topology_t topology, struct hwloc_distances_s *distances);
-
-/** \brief Release a distance matrix structure previously returned by hwloc_distances_get().
- *
- * \note This function is not required if the structure is removed with hwloc_distances_release_remove().
- */
-HWLOC_DECLSPEC void
-hwloc_distances_release(hwloc_topology_t topology, struct hwloc_distances_s *distances);
-
-/** @} */
-
-
-
-/** \defgroup hwlocality_distances_consult Helpers for consulting distance matrices
- * @{
- */
-
-/** \brief Find the index of an object in a distances structure.
- *
- * \return -1 if object \p obj is not involved in structure \p distances.
- */
-static __hwloc_inline int
-hwloc_distances_obj_index(struct hwloc_distances_s *distances, hwloc_obj_t obj)
-{
-  unsigned i;
-  for(i=0; i<distances->nbobjs; i++)
-    if (distances->objs[i] == obj)
-      return (int)i;
-  return -1;
-}
-
-/** \brief Find the values between two objects in a distance matrices.
- *
- * The distance from \p obj1 to \p obj2 is stored in the value pointed by
- * \p value1to2 and reciprocally.
- *
- * \return -1 if object \p obj1 or \p obj2 is not involved in structure \p distances.
- */
-static __hwloc_inline int
-hwloc_distances_obj_pair_values(struct hwloc_distances_s *distances,
-				hwloc_obj_t obj1, hwloc_obj_t obj2,
-				hwloc_uint64_t *value1to2, hwloc_uint64_t *value2to1)
-{
-  int i1 = hwloc_distances_obj_index(distances, obj1);
-  int i2 = hwloc_distances_obj_index(distances, obj2);
-  if (i1 < 0 || i2 < 0)
-    return -1;
-  *value1to2 = distances->values[i1 * distances->nbobjs + i2];
-  *value2to1 = distances->values[i2 * distances->nbobjs + i1];
-  return 0;
-}
-
-/** @} */
-
-
-
-/** \defgroup hwlocality_distances_add Add or remove distances between objects
- * @{
- */
-
-/** \brief Flags for adding a new distances to a topology. */
-enum hwloc_distances_add_flag_e {
-  /** \brief Try to group objects based on the newly provided distance information.
-   * \hideinitializer
-   */
-  HWLOC_DISTANCES_ADD_FLAG_GROUP = (1UL<<0),
-  /** \brief If grouping, consider the distance values as inaccurate and relax the
-   * comparisons during the grouping algorithms. The actual accuracy may be modified
-   * through the HWLOC_GROUPING_ACCURACY environment variable (see \ref envvar).
-   * \hideinitializer
-   */
-  HWLOC_DISTANCES_ADD_FLAG_GROUP_INACCURATE = (1UL<<1)
-};
-
-/** \brief Provide a new distance matrix.
- *
- * Provide the matrix of distances between a set of objects given by \p nbobjs
- * and the \p objs array. \p nbobjs must be at least 2.
- * The distances are stored as a one-dimension array in \p values.
- * The distance from object i to object j is in slot i*nbobjs+j.
- *
- * \p kind specifies the kind of distance as a OR'ed set of ::hwloc_distances_kind_e.
- * Kind ::HWLOC_DISTANCES_KIND_HETEROGENEOUS_TYPES will be automatically added
- * if objects of different types are given.
- *
- * \p flags configures the behavior of the function using an optional OR'ed set of
- * ::hwloc_distances_add_flag_e.
- */
-HWLOC_DECLSPEC int hwloc_distances_add(hwloc_topology_t topology,
-				       unsigned nbobjs, hwloc_obj_t *objs, hwloc_uint64_t *values,
-				       unsigned long kind, unsigned long flags);
-
-/** \brief Remove all distance matrices from a topology.
- *
- * Remove all distance matrices, either provided by the user or
- * gathered through the OS.
- *
- * If these distances were used to group objects, these additional
- * Group objects are not removed from the topology.
- */
-HWLOC_DECLSPEC int hwloc_distances_remove(hwloc_topology_t topology);
-
-/** \brief Remove distance matrices for objects at a specific depth in the topology.
- *
- * Identical to hwloc_distances_remove() but only applies to one level of the topology.
- */
-HWLOC_DECLSPEC int hwloc_distances_remove_by_depth(hwloc_topology_t topology, int depth);
-
-/** \brief Remove distance matrices for objects of a specific type in the topology.
- *
- * Identical to hwloc_distances_remove() but only applies to one level of the topology.
- */
-static __hwloc_inline int
-hwloc_distances_remove_by_type(hwloc_topology_t topology, hwloc_obj_type_t type)
-{
-  int depth = hwloc_get_type_depth(topology, type);
-  if (depth == HWLOC_TYPE_DEPTH_UNKNOWN || depth == HWLOC_TYPE_DEPTH_MULTIPLE)
-    return 0;
-  return hwloc_distances_remove_by_depth(topology, depth);
-}
-
-/** \brief Release and remove the given distance matrice from the topology.
- *
- * This function includes a call to hwloc_distances_release().
- */
-HWLOC_DECLSPEC int hwloc_distances_release_remove(hwloc_topology_t topology, struct hwloc_distances_s *distances);
-
-/** @} */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* HWLOC_DISTANCES_H */
--- a/src/3rdparty/hwloc/include/hwloc/export.h
+++ b/src/3rdparty/hwloc/include/hwloc/export.h
@@ -1,278 +0,0 @@
-/*
- * Copyright © 2009-2018 Inria.  All rights reserved.
- * Copyright © 2009-2012 Université Bordeaux
- * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
- * See COPYING in top-level directory.
- */
-
-/** \file
- * \brief Exporting Topologies to XML or to Synthetic strings.
- */
-
-#ifndef HWLOC_EXPORT_H
-#define HWLOC_EXPORT_H
-
-#ifndef HWLOC_H
-#error Please include the main hwloc.h instead
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#elif 0
-}
-#endif
-
-
-/** \defgroup hwlocality_xmlexport Exporting Topologies to XML
- * @{
- */
-
-/** \brief Flags for exporting XML topologies.
- *
- * Flags to be given as a OR'ed set to hwloc_topology_export_xml().
- */
-enum hwloc_topology_export_xml_flags_e {
- /** \brief Export XML that is loadable by hwloc v1.x.
-  * However, the export may miss some details about the topology.
-  * \hideinitializer
-  */
- HWLOC_TOPOLOGY_EXPORT_XML_FLAG_V1 = (1UL<<0)
-};
-
-/** \brief Export the topology into an XML file.
- *
- * This file may be loaded later through hwloc_topology_set_xml().
- *
- * By default, the latest export format is used, which means older hwloc
- * releases (e.g. v1.x) will not be able to import it.
- * Exporting to v1.x specific XML format is possible using flag
- * ::HWLOC_TOPOLOGY_EXPORT_XML_FLAG_V1 but it may miss some details
- * about the topology.
- * If there is any chance that the exported file may ever be imported
- * back by a process using hwloc 1.x, one should consider detecting
- * it at runtime and using the corresponding export format.
- *
- * \p flags is a OR'ed set of ::hwloc_topology_export_xml_flags_e.
- *
- * \return -1 if a failure occured.
- *
- * \note See also hwloc_topology_set_userdata_export_callback()
- * for exporting application-specific object userdata.
- *
- * \note The topology-specific userdata pointer is ignored when exporting to XML.
- *
- * \note Only printable characters may be exported to XML string attributes.
- * Any other character, especially any non-ASCII character, will be silently
- * dropped.
- *
- * \note If \p name is "-", the XML output is sent to the standard output.
- */
-HWLOC_DECLSPEC int hwloc_topology_export_xml(hwloc_topology_t topology, const char *xmlpath, unsigned long flags);
-
-/** \brief Export the topology into a newly-allocated XML memory buffer.
- *
- * \p xmlbuffer is allocated by the callee and should be freed with
- * hwloc_free_xmlbuffer() later in the caller.
- *
- * This memory buffer may be loaded later through hwloc_topology_set_xmlbuffer().
- *
- * By default, the latest export format is used, which means older hwloc
- * releases (e.g. v1.x) will not be able to import it.
- * Exporting to v1.x specific XML format is possible using flag
- * ::HWLOC_TOPOLOGY_EXPORT_XML_FLAG_V1 but it may miss some details
- * about the topology.
- * If there is any chance that the exported buffer may ever be imported
- * back by a process using hwloc 1.x, one should consider detecting
- * it at runtime and using the corresponding export format.
- *
- * The returned buffer ends with a \0 that is included in the returned
- * length.
- *
- * \p flags is a OR'ed set of ::hwloc_topology_export_xml_flags_e.
- *
- * \return -1 if a failure occured.
- *
- * \note See also hwloc_topology_set_userdata_export_callback()
- * for exporting application-specific object userdata.
- *
- * \note The topology-specific userdata pointer is ignored when exporting to XML.
- *
- * \note Only printable characters may be exported to XML string attributes.
- * Any other character, especially any non-ASCII character, will be silently
- * dropped.
- */
-HWLOC_DECLSPEC int hwloc_topology_export_xmlbuffer(hwloc_topology_t topology, char **xmlbuffer, int *buflen, unsigned long flags);
-
-/** \brief Free a buffer allocated by hwloc_topology_export_xmlbuffer() */
-HWLOC_DECLSPEC void hwloc_free_xmlbuffer(hwloc_topology_t topology, char *xmlbuffer);
-
-/** \brief Set the application-specific callback for exporting object userdata
- *
- * The object userdata pointer is not exported to XML by default because hwloc
- * does not know what it contains.
- *
- * This function lets applications set \p export_cb to a callback function
- * that converts this opaque userdata into an exportable string.
- *
- * \p export_cb is invoked during XML export for each object whose
- * \p userdata pointer is not \c NULL.
- * The callback should use hwloc_export_obj_userdata() or
- * hwloc_export_obj_userdata_base64() to actually export
- * something to XML (possibly multiple times per object).
- *
- * \p export_cb may be set to \c NULL if userdata should not be exported to XML.
- *
- * \note The topology-specific userdata pointer is ignored when exporting to XML.
- */
-HWLOC_DECLSPEC void hwloc_topology_set_userdata_export_callback(hwloc_topology_t topology,
-								void (*export_cb)(void *reserved, hwloc_topology_t topology, hwloc_obj_t obj));
-
-/** \brief Export some object userdata to XML
- *
- * This function may only be called from within the export() callback passed
- * to hwloc_topology_set_userdata_export_callback().
- * It may be invoked one of multiple times to export some userdata to XML.
- * The \p buffer content of length \p length is stored with optional name
- * \p name.
- *
- * When importing this XML file, the import() callback (if set) will be
- * called exactly as many times as hwloc_export_obj_userdata() was called
- * during export(). It will receive the corresponding \p name, \p buffer
- * and \p length arguments.
- *
- * \p reserved, \p topology and \p obj must be the first three parameters
- * that were given to the export callback.
- *
- * Only printable characters may be exported to XML string attributes.
- * If a non-printable character is passed in \p name or \p buffer,
- * the function returns -1 with errno set to EINVAL.
- *
- * If exporting binary data, the application should first encode into
- * printable characters only (or use hwloc_export_obj_userdata_base64()).
- * It should also take care of portability issues if the export may
- * be reimported on a different architecture.
- */
-HWLOC_DECLSPEC int hwloc_export_obj_userdata(void *reserved, hwloc_topology_t topology, hwloc_obj_t obj, const char *name, const void *buffer, size_t length);
-
-/** \brief Encode and export some object userdata to XML
- *
- * This function is similar to hwloc_export_obj_userdata() but it encodes
- * the input buffer into printable characters before exporting.
- * On import, decoding is automatically performed before the data is given
- * to the import() callback if any.
- *
- * This function may only be called from within the export() callback passed
- * to hwloc_topology_set_userdata_export_callback().
- *
- * The function does not take care of portability issues if the export
- * may be reimported on a different architecture.
- */
-HWLOC_DECLSPEC int hwloc_export_obj_userdata_base64(void *reserved, hwloc_topology_t topology, hwloc_obj_t obj, const char *name, const void *buffer, size_t length);
-
-/** \brief Set the application-specific callback for importing userdata
- *
- * On XML import, userdata is ignored by default because hwloc does not know
- * how to store it in memory.
- *
- * This function lets applications set \p import_cb to a callback function
- * that will get the XML-stored userdata and store it in the object as expected
- * by the application.
- *
- * \p import_cb is called during hwloc_topology_load() as many times as
- * hwloc_export_obj_userdata() was called during export. The topology
- * is not entirely setup yet. Object attributes are ready to consult,
- * but links between objects are not.
- *
- * \p import_cb may be \c NULL if userdata should be ignored during import.
- *
- * \note \p buffer contains \p length characters followed by a null byte ('\0').
- *
- * \note This function should be called before hwloc_topology_load().
- *
- * \note The topology-specific userdata pointer is ignored when importing from XML.
- */
-HWLOC_DECLSPEC void hwloc_topology_set_userdata_import_callback(hwloc_topology_t topology,
-								void (*import_cb)(hwloc_topology_t topology, hwloc_obj_t obj, const char *name, const void *buffer, size_t length));
-
-/** @} */
-
-
-/** \defgroup hwlocality_syntheticexport Exporting Topologies to Synthetic
- * @{
- */
-
-/** \brief Flags for exporting synthetic topologies.
- *
- * Flags to be given as a OR'ed set to hwloc_topology_export_synthetic().
- */
-enum hwloc_topology_export_synthetic_flags_e {
- /** \brief Export extended types such as L2dcache as basic types such as Cache.
-  *
-  * This is required if loading the synthetic description with hwloc < 1.9.
-  * \hideinitializer
-  */
- HWLOC_TOPOLOGY_EXPORT_SYNTHETIC_FLAG_NO_EXTENDED_TYPES = (1UL<<0),
-
- /** \brief Do not export level attributes.
-  *
-  * Ignore level attributes such as memory/cache sizes or PU indexes.
-  * This is required if loading the synthetic description with hwloc < 1.10.
-  * \hideinitializer
-  */
- HWLOC_TOPOLOGY_EXPORT_SYNTHETIC_FLAG_NO_ATTRS = (1UL<<1),
-
- /** \brief Export the memory hierarchy as expected in hwloc 1.x.
-  *
-  * Instead of attaching memory children to levels, export single NUMA node child
-  * as normal intermediate levels, when possible.
-  * This is required if loading the synthetic description with hwloc 1.x.
-  * However this may fail if some objects have multiple local NUMA nodes.
-  * \hideinitializer
-  */
- HWLOC_TOPOLOGY_EXPORT_SYNTHETIC_FLAG_V1 = (1UL<<2),
-
- /** \brief Do not export memory information.
-  *
-  * Only export the actual hierarchy of normal CPU-side objects and ignore
-  * where memory is attached.
-  * This is useful for when the hierarchy of CPUs is what really matters,
-  * but it behaves as if there was a single machine-wide NUMA node.
-  * \hideinitializer
-  */
- HWLOC_TOPOLOGY_EXPORT_SYNTHETIC_FLAG_IGNORE_MEMORY = (1UL<<3)
-};
-
-/** \brief Export the topology as a synthetic string.
- *
- * At most \p buflen characters will be written in \p buffer,
- * including the terminating \0.
- *
- * This exported string may be given back to hwloc_topology_set_synthetic().
- *
- * \p flags is a OR'ed set of ::hwloc_topology_export_synthetic_flags_e.
- *
- * \return The number of characters that were written,
- * not including the terminating \0.
- *
- * \return -1 if the topology could not be exported,
- * for instance if it is not symmetric.
- *
- * \note I/O and Misc children are ignored, the synthetic string only
- * describes normal children.
- *
- * \note A 1024-byte buffer should be large enough for exporting
- * topologies in the vast majority of cases.
- */
-  HWLOC_DECLSPEC int hwloc_topology_export_synthetic(hwloc_topology_t topology, char *buffer, size_t buflen, unsigned long flags);
-
-/** @} */
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* HWLOC_EXPORT_H */
--- a/src/3rdparty/hwloc/include/hwloc/gl.h
+++ b/src/3rdparty/hwloc/include/hwloc/gl.h
@@ -1,135 +0,0 @@
-/*
- * Copyright © 2012 Blue Brain Project, EPFL. All rights reserved.
- * Copyright © 2012-2013 Inria.  All rights reserved.
- * See COPYING in top-level directory.
- */
-
-/** \file
- * \brief Macros to help interaction between hwloc and OpenGL displays.
- *
- * Applications that use both hwloc and OpenGL may want to include
- * this file so as to get topology information for OpenGL displays.
- */
-
-#ifndef HWLOC_GL_H
-#define HWLOC_GL_H
-
-#include "hwloc.h"
-
-#include <stdio.h>
-#include <string.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** \defgroup hwlocality_gl Interoperability with OpenGL displays
- *
- * This interface offers ways to retrieve topology information about
- * OpenGL displays.
- *
- * Only the NVIDIA display locality information is currently available,
- * using the NV-CONTROL X11 extension and the NVCtrl library.
- *
- * @{
- */
-
-/** \brief Get the hwloc OS device object corresponding to the
- * OpenGL display given by port and device index.
- *
- * Return the OS device object describing the OpenGL display
- * whose port (server) is \p port and device (screen) is \p device.
- * Return NULL if there is none.
- *
- * The topology \p topology does not necessarily have to match the current
- * machine. For instance the topology may be an XML import of a remote host.
- * I/O devices detection and the GL component must be enabled in the topology.
- *
- * \note The corresponding PCI device object can be obtained by looking
- * at the OS device parent object (unless PCI devices are filtered out).
- */
-static __hwloc_inline hwloc_obj_t
-hwloc_gl_get_display_osdev_by_port_device(hwloc_topology_t topology,
-					  unsigned port, unsigned device)
-{
-        unsigned x = (unsigned) -1, y = (unsigned) -1;
-        hwloc_obj_t osdev = NULL;
-        while ((osdev = hwloc_get_next_osdev(topology, osdev)) != NULL) {
-                if (HWLOC_OBJ_OSDEV_GPU == osdev->attr->osdev.type
-                    && osdev->name
-                    && sscanf(osdev->name, ":%u.%u", &x, &y) == 2
-                    && port == x && device == y)
-                        return osdev;
-        }
-	errno = EINVAL;
-        return NULL;
-}
-
-/** \brief Get the hwloc OS device object corresponding to the
- * OpenGL display given by name.
- *
- * Return the OS device object describing the OpenGL display
- * whose name is \p name, built as ":port.device" such as ":0.0" .
- * Return NULL if there is none.
- *
- * The topology \p topology does not necessarily have to match the current
- * machine. For instance the topology may be an XML import of a remote host.
- * I/O devices detection and the GL component must be enabled in the topology.
- *
- * \note The corresponding PCI device object can be obtained by looking
- * at the OS device parent object (unless PCI devices are filtered out).
- */
-static __hwloc_inline hwloc_obj_t
-hwloc_gl_get_display_osdev_by_name(hwloc_topology_t topology,
-				   const char *name)
-{
-        hwloc_obj_t osdev = NULL;
-        while ((osdev = hwloc_get_next_osdev(topology, osdev)) != NULL) {
-                if (HWLOC_OBJ_OSDEV_GPU == osdev->attr->osdev.type
-                    && osdev->name
-                    && !strcmp(name, osdev->name))
-                        return osdev;
-        }
-	errno = EINVAL;
-        return NULL;
-}
-
-/** \brief Get the OpenGL display port and device corresponding
- * to the given hwloc OS object.
- *
- * Return the OpenGL display port (server) in \p port and device (screen)
- * in \p screen that correspond to the given hwloc OS device object.
- * Return \c -1 if there is none.
- *
- * The topology \p topology does not necessarily have to match the current
- * machine. For instance the topology may be an XML import of a remote host.
- * I/O devices detection and the GL component must be enabled in the topology.
- */
-static __hwloc_inline int
-hwloc_gl_get_display_by_osdev(hwloc_topology_t topology __hwloc_attribute_unused,
-			      hwloc_obj_t osdev,
-			      unsigned *port, unsigned *device)
-{
-	unsigned x = -1, y = -1;
-	if (HWLOC_OBJ_OSDEV_GPU == osdev->attr->osdev.type
-	    && sscanf(osdev->name, ":%u.%u", &x, &y) == 2) {
-		*port = x;
-		*device = y;
-		return 0;
-	}
-	errno = EINVAL;
-	return -1;
-}
-
-/** @} */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* HWLOC_GL_H */
-
--- a/src/3rdparty/hwloc/include/hwloc/glibc-sched.h
+++ b/src/3rdparty/hwloc/include/hwloc/glibc-sched.h
@@ -1,126 +0,0 @@
-/*
- * Copyright © 2009 CNRS
- * Copyright © 2009-2013 inria.  All rights reserved.
- * Copyright © 2009-2011 Université Bordeaux
- * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
- * See COPYING in top-level directory.
- */
-
-/** \file
- * \brief Macros to help interaction between hwloc and glibc scheduling routines.
- *
- * Applications that use both hwloc and glibc scheduling routines such as
- * sched_getaffinity() or pthread_attr_setaffinity_np() may want to include
- * this file so as to ease conversion between their respective types.
- */
-
-#ifndef HWLOC_GLIBC_SCHED_H
-#define HWLOC_GLIBC_SCHED_H
-
-#include "hwloc.h"
-#include "hwloc/helper.h"
-
-#include <assert.h>
-
-#if !defined _GNU_SOURCE || !defined _SCHED_H || (!defined CPU_SETSIZE && !defined sched_priority)
-#error Please make sure to include sched.h before including glibc-sched.h, and define _GNU_SOURCE before any inclusion of sched.h
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#ifdef HWLOC_HAVE_CPU_SET
-
-
-/** \defgroup hwlocality_glibc_sched Interoperability with glibc sched affinity
- *
- * This interface offers ways to convert between hwloc cpusets and glibc cpusets
- * such as those manipulated by sched_getaffinity() or pthread_attr_setaffinity_np().
- *
- * \note Topology \p topology must match the current machine.
- *
- * @{
- */
-
-
-/** \brief Convert hwloc CPU set \p toposet into glibc sched affinity CPU set \p schedset
- *
- * This function may be used before calling sched_setaffinity or any other function
- * that takes a cpu_set_t as input parameter.
- *
- * \p schedsetsize should be sizeof(cpu_set_t) unless \p schedset was dynamically allocated with CPU_ALLOC
- */
-static __hwloc_inline int
-hwloc_cpuset_to_glibc_sched_affinity(hwloc_topology_t topology __hwloc_attribute_unused, hwloc_const_cpuset_t hwlocset,
-				    cpu_set_t *schedset, size_t schedsetsize)
-{
-#ifdef CPU_ZERO_S
-  unsigned cpu;
-  CPU_ZERO_S(schedsetsize, schedset);
-  hwloc_bitmap_foreach_begin(cpu, hwlocset)
-    CPU_SET_S(cpu, schedsetsize, schedset);
-  hwloc_bitmap_foreach_end();
-#else /* !CPU_ZERO_S */
-  unsigned cpu;
-  CPU_ZERO(schedset);
-  assert(schedsetsize == sizeof(cpu_set_t));
-  hwloc_bitmap_foreach_begin(cpu, hwlocset)
-    CPU_SET(cpu, schedset);
-  hwloc_bitmap_foreach_end();
-#endif /* !CPU_ZERO_S */
-  return 0;
-}
-
-/** \brief Convert glibc sched affinity CPU set \p schedset into hwloc CPU set
- *
- * This function may be used before calling sched_setaffinity  or any other function
- * that takes a cpu_set_t  as input parameter.
- *
- * \p schedsetsize should be sizeof(cpu_set_t) unless \p schedset was dynamically allocated with CPU_ALLOC
- */
-static __hwloc_inline int
-hwloc_cpuset_from_glibc_sched_affinity(hwloc_topology_t topology __hwloc_attribute_unused, hwloc_cpuset_t hwlocset,
-                                       const cpu_set_t *schedset, size_t schedsetsize)
-{
-  int cpu;
-#ifdef CPU_ZERO_S
-  int count;
-#endif
-  hwloc_bitmap_zero(hwlocset);
-#ifdef CPU_ZERO_S
-  count = CPU_COUNT_S(schedsetsize, schedset);
-  cpu = 0;
-  while (count) {
-    if (CPU_ISSET_S(cpu, schedsetsize, schedset)) {
-      hwloc_bitmap_set(hwlocset, cpu);
-      count--;
-    }
-    cpu++;
-  }
-#else /* !CPU_ZERO_S */
-  /* sched.h does not support dynamic cpu_set_t (introduced in glibc 2.7),
-   * assume we have a very old interface without CPU_COUNT (added in 2.6)
-   */
-  assert(schedsetsize == sizeof(cpu_set_t));
-  for(cpu=0; cpu<CPU_SETSIZE; cpu++)
-    if (CPU_ISSET(cpu, schedset))
-      hwloc_bitmap_set(hwlocset, cpu);
-#endif /* !CPU_ZERO_S */
-  return 0;
-}
-
-/** @} */
-
-
-#endif /* CPU_SET */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* HWLOC_GLIBC_SCHED_H */
--- a/src/3rdparty/hwloc/include/hwloc/helper.h
+++ b/src/3rdparty/hwloc/include/hwloc/helper.h
--- a/src/3rdparty/hwloc/include/hwloc/inlines.h
+++ b/src/3rdparty/hwloc/include/hwloc/inlines.h
@@ -1,146 +0,0 @@
-/*
- * Copyright © 2009 CNRS
- * Copyright © 2009-2018 Inria.  All rights reserved.
- * Copyright © 2009-2012 Université Bordeaux
- * Copyright © 2009-2010 Cisco Systems, Inc.  All rights reserved.
- * See COPYING in top-level directory.
- */
-
-/**
- * This file contains the inline code of functions declared in hwloc.h
- */
-
-#ifndef HWLOC_INLINES_H
-#define HWLOC_INLINES_H
-
-#ifndef HWLOC_H
-#error Please include the main hwloc.h instead
-#endif
-
-#include <stdlib.h>
-#include <errno.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static __hwloc_inline int
-hwloc_get_type_or_below_depth (hwloc_topology_t topology, hwloc_obj_type_t type)
-{
-  int depth = hwloc_get_type_depth(topology, type);
-
-  if (depth != HWLOC_TYPE_DEPTH_UNKNOWN)
-    return depth;
-
-  /* find the highest existing level with type order >= */
-  for(depth = hwloc_get_type_depth(topology, HWLOC_OBJ_PU); ; depth--)
-    if (hwloc_compare_types(hwloc_get_depth_type(topology, depth), type) < 0)
-      return depth+1;
-
-  /* Shouldn't ever happen, as there is always a Machine level with lower order and known depth.  */
-  /* abort(); */
-}
-
-static __hwloc_inline int
-hwloc_get_type_or_above_depth (hwloc_topology_t topology, hwloc_obj_type_t type)
-{
-  int depth = hwloc_get_type_depth(topology, type);
-
-  if (depth != HWLOC_TYPE_DEPTH_UNKNOWN)
-    return depth;
-
-  /* find the lowest existing level with type order <= */
-  for(depth = 0; ; depth++)
-    if (hwloc_compare_types(hwloc_get_depth_type(topology, depth), type) > 0)
-      return depth-1;
-
-  /* Shouldn't ever happen, as there is always a PU level with higher order and known depth.  */
-  /* abort(); */
-}
-
-static __hwloc_inline int
-hwloc_get_nbobjs_by_type (hwloc_topology_t topology, hwloc_obj_type_t type)
-{
-  int depth = hwloc_get_type_depth(topology, type);
-  if (depth == HWLOC_TYPE_DEPTH_UNKNOWN)
-    return 0;
-  if (depth == HWLOC_TYPE_DEPTH_MULTIPLE)
-    return -1; /* FIXME: agregate nbobjs from different levels? */
-  return (int) hwloc_get_nbobjs_by_depth(topology, depth);
-}
-
-static __hwloc_inline hwloc_obj_t
-hwloc_get_obj_by_type (hwloc_topology_t topology, hwloc_obj_type_t type, unsigned idx)
-{
-  int depth = hwloc_get_type_depth(topology, type);
-  if (depth == HWLOC_TYPE_DEPTH_UNKNOWN)
-    return NULL;
-  if (depth == HWLOC_TYPE_DEPTH_MULTIPLE)
-    return NULL;
-  return hwloc_get_obj_by_depth(topology, depth, idx);
-}
-
-static __hwloc_inline hwloc_obj_t
-hwloc_get_next_obj_by_depth (hwloc_topology_t topology, int depth, hwloc_obj_t prev)
-{
-  if (!prev)
-    return hwloc_get_obj_by_depth (topology, depth, 0);
-  if (prev->depth != depth)
-    return NULL;
-  return prev->next_cousin;
-}
-
-static __hwloc_inline hwloc_obj_t
-hwloc_get_next_obj_by_type (hwloc_topology_t topology, hwloc_obj_type_t type,
-			    hwloc_obj_t prev)
-{
-  int depth = hwloc_get_type_depth(topology, type);
-  if (depth == HWLOC_TYPE_DEPTH_UNKNOWN || depth == HWLOC_TYPE_DEPTH_MULTIPLE)
-    return NULL;
-  return hwloc_get_next_obj_by_depth (topology, depth, prev);
-}
-
-static __hwloc_inline hwloc_obj_t
-hwloc_get_root_obj (hwloc_topology_t topology)
-{
-  return hwloc_get_obj_by_depth (topology, 0, 0);
-}
-
-static __hwloc_inline const char *
-hwloc_obj_get_info_by_name(hwloc_obj_t obj, const char *name)
-{
-  unsigned i;
-  for(i=0; i<obj->infos_count; i++) {
-    struct hwloc_info_s *info = &obj->infos[i];
-    if (!strcmp(info->name, name))
-      return info->value;
-  }
-  return NULL;
-}
-
-static __hwloc_inline void *
-hwloc_alloc_membind_policy(hwloc_topology_t topology, size_t len, hwloc_const_cpuset_t set, hwloc_membind_policy_t policy, int flags)
-{
-  void *p = hwloc_alloc_membind(topology, len, set, policy, flags);
-  if (p)
-    return p;
-
-  if (hwloc_set_membind(topology, set, policy, flags) < 0)
-    /* hwloc_set_membind() takes care of ignoring errors if non-STRICT */
-    return NULL;
-
-  p = hwloc_alloc(topology, len);
-  if (p && policy != HWLOC_MEMBIND_FIRSTTOUCH)
-    /* Enforce the binding by touching the data */
-    memset(p, 0, len);
-  return p;
-}
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* HWLOC_INLINES_H */
--- a/src/3rdparty/hwloc/include/hwloc/intel-mic.h
+++ b/src/3rdparty/hwloc/include/hwloc/intel-mic.h
@@ -1,136 +0,0 @@
-/*
- * Copyright © 2013-2016 Inria.  All rights reserved.
- * See COPYING in top-level directory.
- */
-
-/** \file
- * \brief Macros to help interaction between hwloc and Intel Xeon Phi (MIC).
- *
- * Applications that use both hwloc and Intel Xeon Phi (MIC) may want to
- * include this file so as to get topology information for MIC devices.
- */
-
-#ifndef HWLOC_INTEL_MIC_H
-#define HWLOC_INTEL_MIC_H
-
-#include "hwloc.h"
-#include "hwloc/autogen/config.h"
-#include "hwloc/helper.h"
-
-#ifdef HWLOC_LINUX_SYS
-#include "hwloc/linux.h"
-
-#include <dirent.h>
-#include <string.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** \defgroup hwlocality_intel_mic Interoperability with Intel Xeon Phi (MIC)
- *
- * This interface offers ways to retrieve topology information about
- * Intel Xeon Phi (MIC) devices.
- *
- * @{
- */
-
-/** \brief Get the CPU set of logical processors that are physically
- * close to MIC device whose index is \p idx.
- *
- * Return the CPU set describing the locality of the MIC device whose index is \p idx.
- *
- * Topology \p topology and device index \p idx must match the local machine.
- * I/O devices detection is not needed in the topology.
- *
- * The function only returns the locality of the device.
- * If more information about the device is needed, OS objects should
- * be used instead, see hwloc_intel_mic_get_device_osdev_by_index().
- *
- * This function is currently only implemented in a meaningful way for
- * Linux; other systems will simply get a full cpuset.
- */
-static __hwloc_inline int
-hwloc_intel_mic_get_device_cpuset(hwloc_topology_t topology __hwloc_attribute_unused,
-				  int idx __hwloc_attribute_unused,
-				  hwloc_cpuset_t set)
-{
-#ifdef HWLOC_LINUX_SYS
-	/* If we're on Linux, use the sysfs mechanism to get the local cpus */
-#define HWLOC_INTEL_MIC_DEVICE_SYSFS_PATH_MAX 128
-	char path[HWLOC_INTEL_MIC_DEVICE_SYSFS_PATH_MAX];
-	DIR *sysdir = NULL;
-	struct dirent *dirent;
-	unsigned pcibus, pcidev, pcifunc;
-
-	if (!hwloc_topology_is_thissystem(topology)) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	sprintf(path, "/sys/class/mic/mic%d", idx);
-	sysdir = opendir(path);
-	if (!sysdir)
-		return -1;
-
-	while ((dirent = readdir(sysdir)) != NULL) {
-		if (sscanf(dirent->d_name, "pci_%02x:%02x.%02x", &pcibus, &pcidev, &pcifunc) == 3) {
-			sprintf(path, "/sys/class/mic/mic%d/pci_%02x:%02x.%02x/local_cpus", idx, pcibus, pcidev, pcifunc);
-			if (hwloc_linux_read_path_as_cpumask(path, set) < 0
-			    || hwloc_bitmap_iszero(set))
-				hwloc_bitmap_copy(set, hwloc_topology_get_complete_cpuset(topology));
-			break;
-		}
-	}
-
-	closedir(sysdir);
-#else
-	/* Non-Linux systems simply get a full cpuset */
-	hwloc_bitmap_copy(set, hwloc_topology_get_complete_cpuset(topology));
-#endif
-	return 0;
-}
-
-/** \brief Get the hwloc OS device object corresponding to the
- * MIC device for the given index.
- *
- * Return the OS device object describing the MIC device whose index is \p idx.
- * Return NULL if there is none.
- *
- * The topology \p topology does not necessarily have to match the current
- * machine. For instance the topology may be an XML import of a remote host.
- * I/O devices detection must be enabled in the topology.
- *
- * \note The corresponding PCI device object can be obtained by looking
- * at the OS device parent object.
- */
-static __hwloc_inline hwloc_obj_t
-hwloc_intel_mic_get_device_osdev_by_index(hwloc_topology_t topology,
-					  unsigned idx)
-{
-	hwloc_obj_t osdev = NULL;
-	while ((osdev = hwloc_get_next_osdev(topology, osdev)) != NULL) {
-		if (HWLOC_OBJ_OSDEV_COPROC == osdev->attr->osdev.type
-                    && osdev->name
-		    && !strncmp("mic", osdev->name, 3)
-		    && atoi(osdev->name + 3) == (int) idx)
-                        return osdev;
-        }
-        return NULL;
-}
-
-/** @} */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* HWLOC_INTEL_MIC_H */
--- a/src/3rdparty/hwloc/include/hwloc/linux-libnuma.h
+++ b/src/3rdparty/hwloc/include/hwloc/linux-libnuma.h
@@ -1,274 +0,0 @@
-/*
- * Copyright © 2009 CNRS
- * Copyright © 2009-2017 Inria.  All rights reserved.
- * Copyright © 2009-2010, 2012 Université Bordeaux
- * See COPYING in top-level directory.
- */
-
-/** \file
- * \brief Macros to help interaction between hwloc and Linux libnuma.
- *
- * Applications that use both Linux libnuma and hwloc may want to
- * include this file so as to ease conversion between their respective types.
-*/
-
-#ifndef HWLOC_LINUX_LIBNUMA_H
-#define HWLOC_LINUX_LIBNUMA_H
-
-#include "hwloc.h"
-
-#include <numa.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** \defgroup hwlocality_linux_libnuma_ulongs Interoperability with Linux libnuma unsigned long masks
- *
- * This interface helps converting between Linux libnuma unsigned long masks
- * and hwloc cpusets and nodesets.
- *
- * \note Topology \p topology must match the current machine.
- *
- * \note The behavior of libnuma is undefined if the kernel is not NUMA-aware.
- * (when CONFIG_NUMA is not set in the kernel configuration).
- * This helper and libnuma may thus not be strictly compatible in this case,
- * which may be detected by checking whether numa_available() returns -1.
- *
- * @{
- */
-
-
-/** \brief Convert hwloc CPU set \p cpuset into the array of unsigned long \p mask
- *
- * \p mask is the array of unsigned long that will be filled.
- * \p maxnode contains the maximal node number that may be stored in \p mask.
- * \p maxnode will be set to the maximal node number that was found, plus one.
- *
- * This function may be used before calling set_mempolicy, mbind, migrate_pages
- * or any other function that takes an array of unsigned long and a maximal
- * node number as input parameter.
- */
-static __hwloc_inline int
-hwloc_cpuset_to_linux_libnuma_ulongs(hwloc_topology_t topology, hwloc_const_cpuset_t cpuset,
-				    unsigned long *mask, unsigned long *maxnode)
-{
-  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NUMANODE);
-  unsigned long outmaxnode = -1;
-  hwloc_obj_t node = NULL;
-
-  /* round-up to the next ulong and clear all bytes */
-  *maxnode = (*maxnode + 8*sizeof(*mask) - 1) & ~(8*sizeof(*mask) - 1);
-  memset(mask, 0, *maxnode/8);
-
-  while ((node = hwloc_get_next_obj_covering_cpuset_by_depth(topology, cpuset, depth, node)) != NULL) {
-    if (node->os_index >= *maxnode)
-      continue;
-    mask[node->os_index/sizeof(*mask)/8] |= 1UL << (node->os_index % (sizeof(*mask)*8));
-    if (outmaxnode == (unsigned long) -1 || outmaxnode < node->os_index)
-      outmaxnode = node->os_index;
-  }
-
-  *maxnode = outmaxnode+1;
-  return 0;
-}
-
-/** \brief Convert hwloc NUMA node set \p nodeset into the array of unsigned long \p mask
- *
- * \p mask is the array of unsigned long that will be filled.
- * \p maxnode contains the maximal node number that may be stored in \p mask.
- * \p maxnode will be set to the maximal node number that was found, plus one.
- *
- * This function may be used before calling set_mempolicy, mbind, migrate_pages
- * or any other function that takes an array of unsigned long and a maximal
- * node number as input parameter.
- */
-static __hwloc_inline int
-hwloc_nodeset_to_linux_libnuma_ulongs(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset,
-				      unsigned long *mask, unsigned long *maxnode)
-{
-  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NUMANODE);
-  unsigned long outmaxnode = -1;
-  hwloc_obj_t node = NULL;
-
-  /* round-up to the next ulong and clear all bytes */
-  *maxnode = (*maxnode + 8*sizeof(*mask) - 1) & ~(8*sizeof(*mask) - 1);
-  memset(mask, 0, *maxnode/8);
-
-  while ((node = hwloc_get_next_obj_by_depth(topology, depth, node)) != NULL) {
-    if (node->os_index >= *maxnode)
-      continue;
-    if (!hwloc_bitmap_isset(nodeset, node->os_index))
-      continue;
-    mask[node->os_index/sizeof(*mask)/8] |= 1UL << (node->os_index % (sizeof(*mask)*8));
-    if (outmaxnode == (unsigned long) -1 || outmaxnode < node->os_index)
-      outmaxnode = node->os_index;
-  }
-
-  *maxnode = outmaxnode+1;
-  return 0;
-}
-
-/** \brief Convert the array of unsigned long \p mask into hwloc CPU set
- *
- * \p mask is a array of unsigned long that will be read.
- * \p maxnode contains the maximal node number that may be read in \p mask.
- *
- * This function may be used after calling get_mempolicy or any other function
- * that takes an array of unsigned long as output parameter (and possibly
- * a maximal node number as input parameter).
- */
-static __hwloc_inline int
-hwloc_cpuset_from_linux_libnuma_ulongs(hwloc_topology_t topology, hwloc_cpuset_t cpuset,
-				      const unsigned long *mask, unsigned long maxnode)
-{
-  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NUMANODE);
-  hwloc_obj_t node = NULL;
-  hwloc_bitmap_zero(cpuset);
-  while ((node = hwloc_get_next_obj_by_depth(topology, depth, node)) != NULL)
-    if (node->os_index < maxnode
-	&& (mask[node->os_index/sizeof(*mask)/8] & (1UL << (node->os_index % (sizeof(*mask)*8)))))
-      hwloc_bitmap_or(cpuset, cpuset, node->cpuset);
-  return 0;
-}
-
-/** \brief Convert the array of unsigned long \p mask into hwloc NUMA node set
- *
- * \p mask is a array of unsigned long that will be read.
- * \p maxnode contains the maximal node number that may be read in \p mask.
- *
- * This function may be used after calling get_mempolicy or any other function
- * that takes an array of unsigned long as output parameter (and possibly
- * a maximal node number as input parameter).
- */
-static __hwloc_inline int
-hwloc_nodeset_from_linux_libnuma_ulongs(hwloc_topology_t topology, hwloc_nodeset_t nodeset,
-					const unsigned long *mask, unsigned long maxnode)
-{
-  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NUMANODE);
-  hwloc_obj_t node = NULL;
-  hwloc_bitmap_zero(nodeset);
-  while ((node = hwloc_get_next_obj_by_depth(topology, depth, node)) != NULL)
-    if (node->os_index < maxnode
-	&& (mask[node->os_index/sizeof(*mask)/8] & (1UL << (node->os_index % (sizeof(*mask)*8)))))
-      hwloc_bitmap_set(nodeset, node->os_index);
-  return 0;
-}
-
-/** @} */
-
-
-
-/** \defgroup hwlocality_linux_libnuma_bitmask Interoperability with Linux libnuma bitmask
- *
- * This interface helps converting between Linux libnuma bitmasks
- * and hwloc cpusets and nodesets.
- *
- * \note Topology \p topology must match the current machine.
- *
- * \note The behavior of libnuma is undefined if the kernel is not NUMA-aware.
- * (when CONFIG_NUMA is not set in the kernel configuration).
- * This helper and libnuma may thus not be strictly compatible in this case,
- * which may be detected by checking whether numa_available() returns -1.
- *
- * @{
- */
-
-
-/** \brief Convert hwloc CPU set \p cpuset into the returned libnuma bitmask
- *
- * The returned bitmask should later be freed with numa_bitmask_free.
- *
- * This function may be used before calling many numa_ functions
- * that use a struct bitmask as an input parameter.
- *
- * \return newly allocated struct bitmask.
- */
-static __hwloc_inline struct bitmask *
-hwloc_cpuset_to_linux_libnuma_bitmask(hwloc_topology_t topology, hwloc_const_cpuset_t cpuset) __hwloc_attribute_malloc;
-static __hwloc_inline struct bitmask *
-hwloc_cpuset_to_linux_libnuma_bitmask(hwloc_topology_t topology, hwloc_const_cpuset_t cpuset)
-{
-  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NUMANODE);
-  hwloc_obj_t node = NULL;
-  struct bitmask *bitmask = numa_allocate_cpumask();
-  if (!bitmask)
-    return NULL;
-  while ((node = hwloc_get_next_obj_covering_cpuset_by_depth(topology, cpuset, depth, node)) != NULL)
-    if (node->attr->numanode.local_memory)
-      numa_bitmask_setbit(bitmask, node->os_index);
-  return bitmask;
-}
-
-/** \brief Convert hwloc NUMA node set \p nodeset into the returned libnuma bitmask
- *
- * The returned bitmask should later be freed with numa_bitmask_free.
- *
- * This function may be used before calling many numa_ functions
- * that use a struct bitmask as an input parameter.
- *
- * \return newly allocated struct bitmask.
- */
-static __hwloc_inline struct bitmask *
-hwloc_nodeset_to_linux_libnuma_bitmask(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset) __hwloc_attribute_malloc;
-static __hwloc_inline struct bitmask *
-hwloc_nodeset_to_linux_libnuma_bitmask(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset)
-{
-  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NUMANODE);
-  hwloc_obj_t node = NULL;
-  struct bitmask *bitmask = numa_allocate_cpumask();
-  if (!bitmask)
-    return NULL;
-  while ((node = hwloc_get_next_obj_by_depth(topology, depth, node)) != NULL)
-    if (hwloc_bitmap_isset(nodeset, node->os_index) && node->attr->numanode.local_memory)
-      numa_bitmask_setbit(bitmask, node->os_index);
-  return bitmask;
-}
-
-/** \brief Convert libnuma bitmask \p bitmask into hwloc CPU set \p cpuset
- *
- * This function may be used after calling many numa_ functions
- * that use a struct bitmask as an output parameter.
- */
-static __hwloc_inline int
-hwloc_cpuset_from_linux_libnuma_bitmask(hwloc_topology_t topology, hwloc_cpuset_t cpuset,
-					const struct bitmask *bitmask)
-{
-  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NUMANODE);
-  hwloc_obj_t node = NULL;
-  hwloc_bitmap_zero(cpuset);
-  while ((node = hwloc_get_next_obj_by_depth(topology, depth, node)) != NULL)
-    if (numa_bitmask_isbitset(bitmask, node->os_index))
-      hwloc_bitmap_or(cpuset, cpuset, node->cpuset);
-  return 0;
-}
-
-/** \brief Convert libnuma bitmask \p bitmask into hwloc NUMA node set \p nodeset
- *
- * This function may be used after calling many numa_ functions
- * that use a struct bitmask as an output parameter.
- */
-static __hwloc_inline int
-hwloc_nodeset_from_linux_libnuma_bitmask(hwloc_topology_t topology, hwloc_nodeset_t nodeset,
-					 const struct bitmask *bitmask)
-{
-  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NUMANODE);
-  hwloc_obj_t node = NULL;
-  hwloc_bitmap_zero(nodeset);
-  while ((node = hwloc_get_next_obj_by_depth(topology, depth, node)) != NULL)
-    if (numa_bitmask_isbitset(bitmask, node->os_index))
-      hwloc_bitmap_set(nodeset, node->os_index);
-  return 0;
-}
-
-/** @} */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* HWLOC_LINUX_NUMA_H */
--- a/src/3rdparty/hwloc/include/hwloc/linux.h
+++ b/src/3rdparty/hwloc/include/hwloc/linux.h
@@ -1,80 +0,0 @@
-/*
- * Copyright © 2009 CNRS
- * Copyright © 2009-2016 Inria.  All rights reserved.
- * Copyright © 2009-2011 Université Bordeaux
- * See COPYING in top-level directory.
- */
-
-/** \file
- * \brief Macros to help interaction between hwloc and Linux.
- *
- * Applications that use hwloc on Linux may want to include this file
- * if using some low-level Linux features.
- */
-
-#ifndef HWLOC_LINUX_H
-#define HWLOC_LINUX_H
-
-#include "hwloc.h"
-
-#include <stdio.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** \defgroup hwlocality_linux Linux-specific helpers
- *
- * This includes helpers for manipulating Linux kernel cpumap files, and hwloc
- * equivalents of the Linux sched_setaffinity and sched_getaffinity system calls.
- *
- * @{
- */
-
-/** \brief Bind a thread \p tid on cpus given in cpuset \p set
- *
- * The behavior is exactly the same as the Linux sched_setaffinity system call,
- * but uses a hwloc cpuset.
- *
- * \note This is equivalent to calling hwloc_set_proc_cpubind() with
- * HWLOC_CPUBIND_THREAD as flags.
- */
-HWLOC_DECLSPEC int hwloc_linux_set_tid_cpubind(hwloc_topology_t topology, pid_t tid, hwloc_const_cpuset_t set);
-
-/** \brief Get the current binding of thread \p tid
- *
- * The behavior is exactly the same as the Linux sched_getaffinity system call,
- * but uses a hwloc cpuset.
- *
- * \note This is equivalent to calling hwloc_get_proc_cpubind() with
- * ::HWLOC_CPUBIND_THREAD as flags.
- */
-HWLOC_DECLSPEC int hwloc_linux_get_tid_cpubind(hwloc_topology_t topology, pid_t tid, hwloc_cpuset_t set);
-
-/** \brief Get the last physical CPU where thread \p tid ran.
- *
- * \note This is equivalent to calling hwloc_get_proc_last_cpu_location() with
- * ::HWLOC_CPUBIND_THREAD as flags.
- */
-HWLOC_DECLSPEC int hwloc_linux_get_tid_last_cpu_location(hwloc_topology_t topology, pid_t tid, hwloc_bitmap_t set);
-
-/** \brief Convert a linux kernel cpumask file \p path into a hwloc bitmap \p set.
- *
- * Might be used when reading CPU set from sysfs attributes such as topology
- * and caches for processors, or local_cpus for devices.
- *
- * \note This function ignores the HWLOC_FSROOT environment variable.
- */
-HWLOC_DECLSPEC int hwloc_linux_read_path_as_cpumask(const char *path, hwloc_bitmap_t set);
-
-/** @} */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* HWLOC_LINUX_H */
--- a/src/3rdparty/hwloc/include/hwloc/nvml.h
+++ b/src/3rdparty/hwloc/include/hwloc/nvml.h
@@ -1,181 +0,0 @@
-/*
- * Copyright © 2012-2016 Inria.  All rights reserved.
- * See COPYING in top-level directory.
- */
-
-/** \file
- * \brief Macros to help interaction between hwloc and the NVIDIA Management Library.
- *
- * Applications that use both hwloc and the NVIDIA Management Library may want to
- * include this file so as to get topology information for NVML devices.
- */
-
-#ifndef HWLOC_NVML_H
-#define HWLOC_NVML_H
-
-#include "hwloc.h"
-#include "hwloc/autogen/config.h"
-#include "hwloc/helper.h"
-#ifdef HWLOC_LINUX_SYS
-#include "hwloc/linux.h"
-#endif
-
-#include <nvml.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** \defgroup hwlocality_nvml Interoperability with the NVIDIA Management Library
- *
- * This interface offers ways to retrieve topology information about
- * devices managed by the NVIDIA Management Library (NVML).
- *
- * @{
- */
-
-/** \brief Get the CPU set of logical processors that are physically
- * close to NVML device \p device.
- *
- * Return the CPU set describing the locality of the NVML device \p device.
- *
- * Topology \p topology and device \p device must match the local machine.
- * I/O devices detection and the NVML component are not needed in the topology.
- *
- * The function only returns the locality of the device.
- * If more information about the device is needed, OS objects should
- * be used instead, see hwloc_nvml_get_device_osdev()
- * and hwloc_nvml_get_device_osdev_by_index().
- *
- * This function is currently only implemented in a meaningful way for
- * Linux; other systems will simply get a full cpuset.
- */
-static __hwloc_inline int
-hwloc_nvml_get_device_cpuset(hwloc_topology_t topology __hwloc_attribute_unused,
-			     nvmlDevice_t device, hwloc_cpuset_t set)
-{
-#ifdef HWLOC_LINUX_SYS
-  /* If we're on Linux, use the sysfs mechanism to get the local cpus */
-#define HWLOC_NVML_DEVICE_SYSFS_PATH_MAX 128
-  char path[HWLOC_NVML_DEVICE_SYSFS_PATH_MAX];
-  nvmlReturn_t nvres;
-  nvmlPciInfo_t pci;
-
-  if (!hwloc_topology_is_thissystem(topology)) {
-    errno = EINVAL;
-    return -1;
-  }
-
-  nvres = nvmlDeviceGetPciInfo(device, &pci);
-  if (NVML_SUCCESS != nvres) {
-    errno = EINVAL;
-    return -1;
-  }
-
-  sprintf(path, "/sys/bus/pci/devices/%04x:%02x:%02x.0/local_cpus", pci.domain, pci.bus, pci.device);
-  if (hwloc_linux_read_path_as_cpumask(path, set) < 0
-      || hwloc_bitmap_iszero(set))
-    hwloc_bitmap_copy(set, hwloc_topology_get_complete_cpuset(topology));
-#else
-  /* Non-Linux systems simply get a full cpuset */
-  hwloc_bitmap_copy(set, hwloc_topology_get_complete_cpuset(topology));
-#endif
-  return 0;
-}
-
-/** \brief Get the hwloc OS device object corresponding to the
- * NVML device whose index is \p idx.
- *
- * Return the OS device object describing the NVML device whose
- * index is \p idx. Returns NULL if there is none.
- *
- * The topology \p topology does not necessarily have to match the current
- * machine. For instance the topology may be an XML import of a remote host.
- * I/O devices detection and the NVML component must be enabled in the topology.
- *
- * \note The corresponding PCI device object can be obtained by looking
- * at the OS device parent object (unless PCI devices are filtered out).
- */
-static __hwloc_inline hwloc_obj_t
-hwloc_nvml_get_device_osdev_by_index(hwloc_topology_t topology, unsigned idx)
-{
-	hwloc_obj_t osdev = NULL;
-	while ((osdev = hwloc_get_next_osdev(topology, osdev)) != NULL) {
-                if (HWLOC_OBJ_OSDEV_GPU == osdev->attr->osdev.type
-                    && osdev->name
-		    && !strncmp("nvml", osdev->name, 4)
-		    && atoi(osdev->name + 4) == (int) idx)
-                        return osdev;
-        }
-        return NULL;
-}
-
-/** \brief Get the hwloc OS device object corresponding to NVML device \p device.
- *
- * Return the hwloc OS device object that describes the given
- * NVML device \p device. Return NULL if there is none.
- *
- * Topology \p topology and device \p device must match the local machine.
- * I/O devices detection and the NVML component must be enabled in the topology.
- * If not, the locality of the object may still be found using
- * hwloc_nvml_get_device_cpuset().
- *
- * \note The corresponding hwloc PCI device may be found by looking
- * at the result parent pointer (unless PCI devices are filtered out).
- */
-static __hwloc_inline hwloc_obj_t
-hwloc_nvml_get_device_osdev(hwloc_topology_t topology, nvmlDevice_t device)
-{
-	hwloc_obj_t osdev;
-	nvmlReturn_t nvres;
-	nvmlPciInfo_t pci;
-	char uuid[64];
-
-	if (!hwloc_topology_is_thissystem(topology)) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	nvres = nvmlDeviceGetPciInfo(device, &pci);
-	if (NVML_SUCCESS != nvres)
-		return NULL;
-
-	nvres = nvmlDeviceGetUUID(device, uuid, sizeof(uuid));
-	if (NVML_SUCCESS != nvres)
-		uuid[0] = '\0';
-
-	osdev = NULL;
-	while ((osdev = hwloc_get_next_osdev(topology, osdev)) != NULL) {
-		hwloc_obj_t pcidev = osdev->parent;
-		const char *info;
-
-		if (strncmp(osdev->name, "nvml", 4))
-			continue;
-
-		if (pcidev
-		    && pcidev->type == HWLOC_OBJ_PCI_DEVICE
-		    && pcidev->attr->pcidev.domain == pci.domain
-		    && pcidev->attr->pcidev.bus == pci.bus
-		    && pcidev->attr->pcidev.dev == pci.device
-		    && pcidev->attr->pcidev.func == 0)
-			return osdev;
-
-		info = hwloc_obj_get_info_by_name(osdev, "NVIDIAUUID");
-		if (info && !strcmp(info, uuid))
-			return osdev;
-	}
-
-	return NULL;
-}
-
-/** @} */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* HWLOC_NVML_H */
--- a/Show More
+++ b/Show More