From dda22725b167fed9868e0f1573bfb3345e4911ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondra=20Mi=C4=8Dka=20=40=20miles-teg?= <mitch.ondra@gmail.com> Date: Thu, 11 Nov 2021 10:31:29 +0100 Subject: [PATCH] matrix_experiment: added hyphen in test names --- 07-matrix_experiment/cpp/Makefile | 2 +- 07-matrix_experiment/cpp/matrix_experiment_real.cpp | 2 +- 07-matrix_experiment/cpp/matrix_experiment_sim.cpp | 2 +- 07-matrix_experiment/python/Makefile | 4 ++-- 07-matrix_experiment/task.md | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/07-matrix_experiment/cpp/Makefile b/07-matrix_experiment/cpp/Makefile index ab0539e..ce3b51d 100644 --- a/07-matrix_experiment/cpp/Makefile +++ b/07-matrix_experiment/cpp/Makefile @@ -21,6 +21,6 @@ matrix_experiment_real: matrix_transpose.h matrix_tests.h matrix_experiment_real $(CXX) $(CPPFLAGS) $(CXXFLAGS) matrix_experiment_real.cpp -o $@ .PHONY: clean -clean: +clean:: rm -f matrix_experiment_sim matrix_experiment_real rm -rf out diff --git a/07-matrix_experiment/cpp/matrix_experiment_real.cpp b/07-matrix_experiment/cpp/matrix_experiment_real.cpp index 3d2a28a..f46c38a 100644 --- a/07-matrix_experiment/cpp/matrix_experiment_real.cpp +++ b/07-matrix_experiment/cpp/matrix_experiment_real.cpp @@ -5,7 +5,7 @@ #include <cmath> #include <iostream> -#include <time.h> // FIXME +#include <time.h> using namespace std; diff --git a/07-matrix_experiment/cpp/matrix_experiment_sim.cpp b/07-matrix_experiment/cpp/matrix_experiment_sim.cpp index 5eca7ab..316db52 100644 --- a/07-matrix_experiment/cpp/matrix_experiment_sim.cpp +++ b/07-matrix_experiment/cpp/matrix_experiment_sim.cpp @@ -6,7 +6,7 @@ #include <string> #include <iostream> -#include <time.h> // FIXME +#include <time.h> using namespace std; diff --git a/07-matrix_experiment/python/Makefile b/07-matrix_experiment/python/Makefile index 6ae85a9..26bbb01 100644 --- a/07-matrix_experiment/python/Makefile +++ b/07-matrix_experiment/python/Makefile @@ -13,5 +13,5 @@ out/t-sim-%-smart: ./matrix_experiment_sim.py $* smart >$@ .PHONY: clean -clean: - rm -rf out +clean:: + rm -rf out __pycache__ diff --git a/07-matrix_experiment/task.md b/07-matrix_experiment/task.md index 40a2682..b6fbb30 100644 --- a/07-matrix_experiment/task.md +++ b/07-matrix_experiment/task.md @@ -29,10 +29,10 @@ proper points will be assigned later. The test program is given two arguments: - Cache type: - - `m1024b16` – cache of 1024 items organized in 16-item blocks - - `m8192b64` – cache of 8192 items organized in 64-item blocks - - `m65536b256` – cache of 65536 items organized on 256-item blocks - - `m65536b4096` – cache of 65536 items organized in 4096-item blocks + - `m1024-b16` – cache of 1024 items organized in 16-item blocks + - `m8192-b64` – cache of 8192 items organized in 64-item blocks + - `m65536-b256` – cache of 65536 items organized on 256-item blocks + - `m65536-b4096` – cache of 65536 items organized in 4096-item blocks - The implementation to test (`smart` or `naive`). The output of the program contains one line per experiment, which consists of -- GitLab