From 33a760489e90e5670f046191361435c1714d87ac Mon Sep 17 00:00:00 2001 From: Tabascl Date: Sun, 23 Jul 2023 18:04:17 +0200 Subject: [PATCH] Remove NVIDIA stuff --- PKGBUILD | 4 +-- app/CMakeLists.txt | 10 ++++--- app/src/main.cxx | 48 +++++++++++++------------------- app/src/sensor/SensorManager.cxx | 5 ++-- 4 files changed, 31 insertions(+), 36 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 5746709..fb13eec 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,12 +1,12 @@ pkgname=fantasize -pkgver=0.1.9 +pkgver=0.2.0 pkgrel=1 pkgdesc='C++ fan control for Linux' url='https://github.com/Tabascl/fantasize.git' source=("$pkgname-$pkgver.tar.gz::https://github.com/Tabascl/fantasize/archive/refs/tags/v$pkgver.tar.gz") arch=('x86_64') license=('GPL3') -makedepends=('git' 'cmake' 'nlohmann-json' 'boost' 'cuda') +makedepends=('git' 'cmake' 'nlohmann-json' 'boost') sha256sums=('SKIP') build() { diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index b2f174d..3c8b26a 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -10,9 +10,9 @@ find_package(Boost 1.74 COMPONENTS program_options log log_setup date_time REQUI add_executable(${PROJECT_NAME} src/main.cxx src/sensor/LMSensorsFacade.cxx - src/sensor/GPUSensorsFacade.cxx +# src/sensor/GPUSensorsFacade.cxx src/sensor/Sensor.cxx - src/sensor/NvidiaSensor.cxx +# src/sensor/NvidiaSensor.cxx src/sensor/LMSensor.cxx src/pwm/PWMControl.cxx src/pwm/PWMControlFacade.cxx @@ -30,8 +30,10 @@ add_executable(${PROJECT_NAME} set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 20) -target_include_directories(${PROJECT_NAME} PUBLIC include /opt/cuda) -target_link_libraries(${PROJECT_NAME} PUBLIC sensors nvidia-ml nlohmann_json::nlohmann_json tbb ${Boost_LIBRARIES}) +# target_include_directories(${PROJECT_NAME} PUBLIC include /opt/cuda) +target_include_directories(${PROJECT_NAME} PUBLIC include) +# target_link_libraries(${PROJECT_NAME} PUBLIC sensors nvidia-ml nlohmann_json::nlohmann_json tbb ${Boost_LIBRARIES}) +target_link_libraries(${PROJECT_NAME} PUBLIC sensors nlohmann_json::nlohmann_json tbb ${Boost_LIBRARIES}) install(TARGETS ${PROJECT_NAME} DESTINATION usr/local/bin) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/unit/fantasize.service DESTINATION usr/lib/systemd/system) diff --git a/app/src/main.cxx b/app/src/main.cxx index e9cbc4b..9d532ee 100644 --- a/app/src/main.cxx +++ b/app/src/main.cxx @@ -20,7 +20,7 @@ #include -#define PROJECT_VERSION "v0.1.9" +#define PROJECT_VERSION "v0.2.0" namespace po = boost::program_options; namespace logging = boost::log; @@ -29,32 +29,26 @@ App app; static int doInitialSetup = 0; -void -signal_handler(int s) -{ - app.Shutdown(); -} +void signal_handler(int s) { app.Shutdown(); } -void -InitLogging(bool verbose) -{ +void InitLogging(bool verbose) { logging::add_console_log( - std::clog, - logging::keywords::format = - (logging::expressions::stream - << "[" - << logging::expressions::format_date_time( - "TimeStamp", "%Y-%m-%d %H:%M:%S") - << "][" - << logging::expressions::format_named_scope( - "Scope", logging::keywords::format = "%c") - << "]" - << "[" << logging::trivial::severity << "] " - << logging::expressions::smessage)); + std::clog, + logging::keywords::format = + (logging::expressions::stream + << "[" + << logging::expressions::format_date_time( + "TimeStamp", "%Y-%m-%d %H:%M:%S") + << "][" + << logging::expressions::format_named_scope( + "Scope", logging::keywords::format = "%c") + << "]" + << "[" << logging::trivial::severity << "] " + << logging::expressions::smessage)); logging::add_common_attributes(); logging::core::get()->add_global_attribute( - "Scope", logging::attributes::named_scope()); + "Scope", logging::attributes::named_scope()); BOOST_LOG_FUNCTION(); @@ -66,9 +60,7 @@ InitLogging(bool verbose) } } -int -main(int argc, char** argv) -{ +int main(int argc, char **argv) { BOOST_LOG_FUNCTION() BOOST_LOG_TRIVIAL(info) << "Version: " << PROJECT_VERSION; @@ -77,8 +69,8 @@ main(int argc, char** argv) po::options_description desc("Allowed options"); desc.add_options()("help,h", "produce help message")( - "setup,s", po::bool_switch(), "run initial setup")( - "verbose,v", po::bool_switch(), "print debug info"); + "setup,s", po::bool_switch(), + "run initial setup")("verbose,v", po::bool_switch(), "print debug info"); po::variables_map vm; po::store(po::parse_command_line(argc, argv, desc), vm); @@ -98,7 +90,7 @@ main(int argc, char** argv) app.Init(); app.NormalOperation(); } - } catch (const std::exception& e) { + } catch (const std::exception &e) { std::cout << "An exception was caught: " << e.what() << std::endl; } diff --git a/app/src/sensor/SensorManager.cxx b/app/src/sensor/SensorManager.cxx index a707291..9f29f27 100644 --- a/app/src/sensor/SensorManager.cxx +++ b/app/src/sensor/SensorManager.cxx @@ -11,8 +11,9 @@ vector> SensorManager::TemperatureSensors() { tempSensors = mLMSensorsFacade->TemperatureSensors(); - auto gpuSensors = mGPUSensorsFacade->TemperatureSensors(); - tempSensors.insert(tempSensors.end(), gpuSensors.begin(), gpuSensors.end()); + // auto gpuSensors = mGPUSensorsFacade->TemperatureSensors(); + // tempSensors.insert(tempSensors.end(), gpuSensors.begin(), + // gpuSensors.end()); return tempSensors; }