From 8200cf19b036678aac3c1167bea4513670c98a27 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 6 Mar 2023 16:16:49 +0100 Subject: [PATCH] Fixes in docs/source/tuto_* (untested). --- docs/source/tuto_disk/tuto_disk.cpp | 4 ++-- .../dahu_platform_ckmeans.cpp | 12 ++++++------ .../dahu_platform_dhist.cpp | 18 +++++++++--------- docs/source/tuto_smpi/gemm_mpi.cpp | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/tuto_disk/tuto_disk.cpp b/docs/source/tuto_disk/tuto_disk.cpp index 1fad8ae82c..0f487ff4a6 100644 --- a/docs/source/tuto_disk/tuto_disk.cpp +++ b/docs/source/tuto_disk/tuto_disk.cpp @@ -35,7 +35,7 @@ static void estimate_bw(const sg4::Disk* disk, int n, int n_flows, bool read) act->wait(); double elapsed_time = sg4::Engine::get_clock() - cur_time; - printf("%s,%s,%d,%d,%d,%lf\n", disk->get_cname(), read ? "read" : "write", n, n_flows, size, elapsed_time); + printf("%s,%s,%d,%d,%llu,%lf\n", disk->get_cname(), read ? "read" : "write", n, n_flows, size, elapsed_time); } static void host() @@ -60,7 +60,7 @@ class DiskNoise { std::mt19937& gen_; public: - DiskNoise(double capacity, std::mt19937& gen, const std::vector& b, const std::vector h) + DiskNoise(double capacity, std::mt19937& gen, const std::vector& b, const std::vector& h) : bw_(capacity), breaks_(b), heights_(h), gen_(gen) { } diff --git a/docs/source/tuto_network_calibration/dahu_platform_ckmeans.cpp b/docs/source/tuto_network_calibration/dahu_platform_ckmeans.cpp index 226cbaca9c..4ee35849e7 100644 --- a/docs/source/tuto_network_calibration/dahu_platform_ckmeans.cpp +++ b/docs/source/tuto_network_calibration/dahu_platform_ckmeans.cpp @@ -18,13 +18,13 @@ class NormalMixture : public Sampler { std::mt19937& gen_; public: - NormalMixture(std::mt19937& gen) : gen_(gen) {} + explicit NormalMixture(std::mt19937& gen) : gen_(gen) {} void append(double mean, double stddev, double prob) { mixture_.push_back(std::normal_distribution(mean, stddev)); prob_.push_back(prob); } - double sample() + double sample() override { std::discrete_distribution<> d(prob_.begin(), prob_.end()); int index = d(gen_); @@ -121,11 +121,11 @@ void load_platform(const sg4::Engine& e) auto zone = e.get_netzone_root(); SegmentedRegression seg = read_json_file("pingpong_ckmeans.json", gen, false); - zone->set_lat_factor_cb(std::bind(&latency_factor_cb, lat_base, seg, std::placeholders::_1, std::placeholders::_2, - std::placeholders::_3, std::placeholders::_4, std::placeholders::_5)); + zone->set_latency_factor_cb(std::bind(&latency_factor_cb, lat_base, seg, std::placeholders::_1, std::placeholders::_2, + std::placeholders::_3, std::placeholders::_4, std::placeholders::_5)); - zone->set_bw_factor_cb(std::bind(&bw_factor_cb, bw_base, seg, std::placeholders::_1, std::placeholders::_2, - std::placeholders::_3, std::placeholders::_4, std::placeholders::_5)); + zone->set_bandwidth_factor_cb(std::bind(&bw_factor_cb, bw_base, seg, std::placeholders::_1, std::placeholders::_2, + std::placeholders::_3, std::placeholders::_4, std::placeholders::_5)); seg = read_json_file("send_ckmeans.json", gen); smpi_register_op_cost_callback(SmpiOperation::SEND, std::bind(&smpi_cost_cb, seg, std::placeholders::_1, diff --git a/docs/source/tuto_network_calibration/dahu_platform_dhist.cpp b/docs/source/tuto_network_calibration/dahu_platform_dhist.cpp index e9ee85d115..cc817e3724 100644 --- a/docs/source/tuto_network_calibration/dahu_platform_dhist.cpp +++ b/docs/source/tuto_network_calibration/dahu_platform_dhist.cpp @@ -19,15 +19,15 @@ class DhistSampler : public Sampler { std::mt19937& gen_; public: - DhistSampler(bool log, std::mt19937& gen, const std::vector& b, const std::vector h) - : log_(log_), breaks_(b), heights_(h), gen_(gen) + DhistSampler(bool log, std::mt19937& gen, const std::vector& b, const std::vector& h) + : log_(log), breaks_(b), heights_(h), gen_(gen) { } - double sample() + double sample() override { std::piecewise_constant_distribution d(breaks_.begin(), breaks_.end(), heights_.begin()); auto value = d(gen_); - if (log) + if (log_) value = std::exp(value); return value; } @@ -126,11 +126,11 @@ void load_platform(const sg4::Engine& e) /* setting network factors callbacks */ auto* zone = e.get_netzone_root(); SegmentedRegression seg = read_json_file("pingpong_dhist.json", gen, false); - zone->set_lat_factor_cb(std::bind(&latency_factor_cb, lat_base, seg, std::placeholders::_1, std::placeholders::_2, - std::placeholders::_3, std::placeholders::_4, std::placeholders::_5)); + zone->set_latency_factor_cb(std::bind(&latency_factor_cb, lat_base, seg, std::placeholders::_1, std::placeholders::_2, + std::placeholders::_3, std::placeholders::_4, std::placeholders::_5)); - zone->set_bw_factor_cb(std::bind(&bw_factor_cb, bw_base, seg, std::placeholders::_1, std::placeholders::_2, - std::placeholders::_3, std::placeholders::_4, std::placeholders::_5)); + zone->set_bandwidth_factor_cb(std::bind(&bw_factor_cb, bw_base, seg, std::placeholders::_1, std::placeholders::_2, + std::placeholders::_3, std::placeholders::_4, std::placeholders::_5)); seg = read_json_file("send_dhist.json", gen); smpi_register_op_cost_callback(SmpiOperation::SEND, std::bind(&smpi_cost_cb, seg, std::placeholders::_1, @@ -142,4 +142,4 @@ void load_platform(const sg4::Engine& e) seg = read_json_file("recv_dhist.json", gen); smpi_register_op_cost_callback(SmpiOperation::RECV, std::bind(&smpi_cost_cb, seg, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); -} \ No newline at end of file +} diff --git a/docs/source/tuto_smpi/gemm_mpi.cpp b/docs/source/tuto_smpi/gemm_mpi.cpp index 6b28638446..ab9920b6c8 100644 --- a/docs/source/tuto_smpi/gemm_mpi.cpp +++ b/docs/source/tuto_smpi/gemm_mpi.cpp @@ -3,8 +3,8 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "stdio.h" -#include "mpi.h" +#include +#include const int size = 3000; @@ -27,7 +27,7 @@ int main(int argc, char* argv[]) { int rank, nproc; int istart, iend; - double start, end; + // double start, end; MPI_Init(&argc, &argv); MPI_Comm_size(MPI_COMM_WORLD, &nproc); -- 2.20.1