rename Json Files #315

codeamic · 2022-03-29T18:12:52Z

Renamed the following files
run_config.json -> sequential.json
multicore_parallel_run_config.json -> parallel_turing.json
multicore_parallel_navajo_run_config.json -> parallel_navajo.json
micro_multicore.json -> micro.json

Sudha247

Hi @codeamic! Thanks for the PR.

The renaming looks correct to me. But there are some more changes apart from the four file renames mentioned, could you look into why they show up please?

You will also need to propagate the renaming to other places it is used at. Let's take run_config.json for example; doing git grep run_config.json shows this:

Makefile:RUN_CONFIG_JSON ?= run_config.json
README.md:benchmarks as defined in the `run_config.json`
README.md:   `run_config.json`. This config file is used to generate dune files
README.md:   `run_config.json` and specified via the `RUN_BENCH_TARGET` variable
README.md:and the default value is `run_config.json`. This file lists the executable to
README.md:The `run_config.json` file may be filtered based on the tag. For example,
README.md:filters the `run_config.json` file to only contain the benchmarks tagged as
README.md:    `run_config.json` for sequential benchmarks and
README.md:    `multicore_parallel_run_config.json` for parallel benchmarks.
README.md: - **run_config.json** : Runs sequential benchmarks with stock OCaml variants in CI and sandmark-nightly on the IITM machine(turing)
README.md: - **multicore_parallel_run_config.json** : Runs parallel benchmarks with multicore OCaml in CI and sandmark-nightly on the IITM machine(turing)
README.md: - **multicore_parallel_navajo_run_config.json** : Runs parallel benchmarks with multicore OCaml in sandmark-nightly on Navajo (AMD EPYC 7551 32-Core Processor) machine
README.md:| RUN_CONFIG_JSON | Input file selection that contains the list of benchmarks | `run_config.json` | executing benchmark |

All these instances of run_config.json need to be renamed to sequential.json. Similarly for the other three files.

codeamic · 2022-03-30T12:01:54Z

Hi Sudha, i just did the changes, thank you for the support,
some other files are showing i edited them which i didn't.

codeamic

Hi Sudha, I just reviewed the files i made changes one, waiting for it to be merged

Sudha247

This is great, the spurious diff has disappeared now. Just some minor bits before we merge.

Sudha247 · 2022-03-31T04:49:36Z

README.md

@@ -177,13 +177,13 @@ current tags are:
 The benchmarking machine `turing` is an Intel Xeon Gold 5120 CPU with 64GB of
 RAM housed at IITM.

-The `run_config.json` file may be filtered based on the tag. For example,
+The `sequential.json` file may be filtered based on the tag. For example,

 ```bash
 $ TAG='"macro_bench"' make run_config_filtered.json


Suggested change

$ TAG='"macro_bench"' make run_config_filtered.json

$ TAG='"macro_bench"' make sequential_filtered.json

The filtered files should also be changed to their new names. Leave the filtered as such and edit the name. This needs to be updated in the run_all* scripts too.

Hi Sudha, thank you for the support, i just did the new changes but couldn't find the run_config_filtered.json file itself.

Nice work! You're right, run_config_filtered.json is created only after we run TAG='"macro_bench"' make run_config_filtered.json, so no need to modify that file.

Are you able to repeat this process for the other three files, like for example run_all_parallel.sh has multicore_parallel_run_config_filtered.json. git grep command should help here too. :)

Yeah i did git grep run_config.json, you could see the changes in all the files. i made sure i changed that in all files. could you please check?

Sorry if it was unclear; what I meant is the same process of replacing *_filtered.json with the new file name needs to be done for multicore_parallel_run_config_filtered.json, i.e it will be called parallel_turing_filtered.json and multicore_parallel_navajo_run_config_filtered.json will be parallel_navajo_filtered.json.

Hi Sudha, no worries i just made the changes
could you please review?
Also, there is this file multicore_parallel_run_config_filtered_filtered_2domains, does it need renaming?

Also, there is this file multicore_parallel_run_config_filtered_filtered_2domains, does it need renaming?

Good point. Yes, we can call it parallel_turing_filtered_filtered_2domains.json. You can see how it's generated here: https://github.com/ocaml-bench/sandmark/blob/main/Makefile#L347-L348. This should make the CI happy I think. You might also want to edit the drone.yml file with the latest names.

Hi Sudha, thank you so much for your endless support, i just did the changes and modified the drone.yml file too. please review for merge or correction of errors, thank you.

codeamic · 2022-04-03T20:37:23Z

Hello Sudha Hope you had a good weekend, please i will be waiting for your reply on what to do next Regards. Sango Pascal.

…

On Fri, 1 Apr 2022, 10:13 Sudha Parimala, ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In README.md <#315 (comment)>: > @@ -177,13 +177,13 @@ current tags are: The benchmarking machine `turing` is an Intel Xeon Gold 5120 CPU with 64GB of RAM housed at IITM. -The `run_config.json` file may be filtered based on the tag. For example, +The `sequential.json` file may be filtered based on the tag. For example, ```bash $ TAG='"macro_bench"' make run_config_filtered.json Also, there is this file multicore_parallel_run_config_filtered_filtered_2domains, does it need renaming? Good point. Yes, we can call it parallel_turing_filtered_filtered_2domains.json. You can see how it's generated here: https://github.com/ocaml-bench/sandmark/blob/main/Makefile#L347-L348. This should make the CI happy I think. You might also want to edit the drone.yml file with the latest names. — Reply to this email directly, view it on GitHub <#315 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AP663VIAJPYPC3I2VAA76ZTVC2435ANCNFSM5R7HVQZQ> . You are receiving this because you were mentioned.Message ID: ***@***.***>

Sudha247

Some final bits in the CI before we can merge. The CI should ideally turn green after the changes.

Sudha247 · 2022-04-04T05:08:20Z

.drone.yml

@@ -46,8 +46,8 @@ steps:
  - export OPAM_DISABLE_SANDBOXING=true
  - TAG='"run_in_ci"' make multicore_parallel_run_config_filtered.json


Suggested change

- TAG='"run_in_ci"' make multicore_parallel_run_config_filtered.json

- TAG='"run_in_ci"' make parallel_turing_filtered.json

Sudha247 · 2022-04-04T05:08:43Z

.drone.yml

@@ -46,8 +46,8 @@ steps:
  - export OPAM_DISABLE_SANDBOXING=true
  - TAG='"run_in_ci"' make multicore_parallel_run_config_filtered.json
  - TAG='"macro_bench"' make multicore_parallel_run_config_filtered_filtered.json


Suggested change

- TAG='"macro_bench"' make multicore_parallel_run_config_filtered_filtered.json

- TAG='"macro_bench"' make parallel_turing_filtered_filtered.json

Sudha247 · 2022-04-04T05:09:18Z

.drone.yml

  - TAG='"run_in_ci"' make multicore_parallel_run_config_filtered.json
  - TAG='"macro_bench"' make multicore_parallel_run_config_filtered_filtered.json


Same as above.

.drone.yml

codeamic · 2022-04-04T06:48:40Z

Hi Sudha, i commited the changes already .

shakthimaan · 2022-04-05T13:35:34Z

run_config.json -> sequential.json

If the filename is changed to sequential.json, the invocation should use sequential_filtered.json. For example:

$ make clean 
$ TAG='"run_in_ci"' make sequential_filtered.json 
$ USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=sequential_filtered.json make ocaml-versions/5.0.0+trunk.bench

multicore_parallel_run_config.json -> parallel_turing.json

Similarly,

$ make clean
$ TAG='"macro_bench"' make parallel_turing_filtered.json 
$ USE_SYS_DUNE_HACK=1 SANDMARK_CUSTOM_NAME=5.0.0 \
    RUN_BENCH_TARGET=run_orunchrt BUILD_BENCH_TARGET=multibench_parallel \
    RUN_CONFIG_JSON=parallel_turing_filtered.json \
    make ocaml-versions/5.0.0+trunk.bench

codeamic · 2022-04-05T15:11:57Z

Hi @shakthimaan , please I don't understand you. do you wand me to add the invocation in the README.md file?

shakthimaan · 2022-04-05T15:50:35Z

do you wand me to add the invocation in the README.md file?

No. You need to update the .drone.yml with the above mentioned changes so that the CI will build fine. For example, the following entry needs to be changed:

sandmark/.drone.yml

Line 21 in 4fa2829

- TAG='"run_in_ci"' make run_config_filtered.json

codeamic · 2022-04-05T16:08:58Z

Ok, i will do that immediately

codeamic · 2022-04-05T20:31:47Z

Hi @shakthimaan , i did the changes already, ould you please review

shakthimaan · 2022-04-06T16:40:42Z

The parallel run is failing, and that needs to be fixed.

TAG='"run_in_ci"' make parallel_turing_filtered.json
jq '{wrappers : .wrappers, benchmarks: [.benchmarks | .[] | select(.tags | index("run_in_ci") != null)]}' < parallel_turing.json > parallel_turing_filtered.json

The above is fine, and it produces a parallel_turing_filtered.json file.

TAG='"macro_bench"' make parallel_turing_filtered.json
make: 'parallel_turing_filtered.json' is up to date.

This should be updated to:

TAG='"macro_bench"' make parallel_turing_filtered_filtered.json

codeamic · 2022-04-07T18:17:17Z

Ok

codeamic · 2022-04-07T19:01:55Z

Hi @shakthimaan, i made the changes, could you please check .

shakthimaan · 2022-04-08T03:12:56Z

The change is required for 5.0.0+trunk+parallel, and not for 5.0.0+stable+parallel. Please see the build log at https://cloud.drone.io/ocaml-bench/sandmark/1154/4/2.

codeamic · 2022-04-08T16:17:26Z

Ohh, sorry about that, i just maade the changes. But facing little problem to push

shakthimaan · 2022-04-08T17:10:00Z

You need to revert the changes for 5.0.0+stable+parallel as in the successful build at line #361:
https://cloud.drone.io/ocaml-bench/sandmark/1083/2/2

The 5.0.0.+trunk+parallel entry still needs to be updated as mentioned in #315 (comment).

codeamic · 2022-04-08T21:30:43Z

All done, could you please check if it is ok now?

Sudha247

The CI changes look fine, just a couple more updates should make it green.

.drone.yml

codeamic · 2022-04-11T17:39:32Z

ok

Sudha247

LGTM! Are you able to rebase your branch to latest main, so we can merge it please? Please also note that there could be conflicts with #316 depending on which on is merged first.

codeamic · 2022-04-12T06:21:35Z

Hi @Sudha247
I just compared my branch with the main branch to make sure there were no conflicts.

Sudha247 · 2022-04-12T06:39:57Z

The GitHub interface tells me these files have merge-conflicts:

multicore_parallel_navajo_run_config.json
multicore_parallel_run_config.json
run_config.json

git pull <upstream> main should fetch the latest changes from the main branch to your branch, after which the merge conflicts will be highlighted. There have been more entries added to the above mentioned files in #322, and the renamed files now need to include those too.

codeamic · 2022-04-12T06:51:50Z

this command does not work git pull main. and i don't have files with those names in my branch. i tried git pull from the main branch, moved to my branch and did git merge main and everything works well

codeamic · 2022-04-12T09:01:39Z

Please how do i resolve this issue?

Sudha247 · 2022-04-12T16:26:32Z

The merge conflicts are still present unfortunately. Can you try to do git fetch --all before pulling it.

git remote add upstream https://github.com/ocaml-bench/sandmark.git
git fetch --all
git pull upstream main

This should fetch the latest main branch to your local branch.

…enameJsonFile "rename of json files and updated this rename in all files that it is been referenced in"

codeamic · 2022-04-13T10:14:14Z

Hi Sudha, thank you for the help. I think it is all good for merging now.

shakthimaan · 2022-06-21T16:27:07Z

Sandmark has been updated to build for 5.1.0+trunk. @ElectreAAS Please review the conflicting files and update the same for the CI.

ElectreAAS · 2022-06-27T09:57:56Z

Sandmark has been updated to build for 5.1.0+trunk. @ElectreAAS Please review the conflicting files and update the same for the CI.

The only conflict is the .drone.yml file which was removed from main in #354.

rename Json Files

f56963e

Sudha247 requested changes Mar 30, 2022

View reviewed changes

update

e8eda9e

codeamic commented Mar 30, 2022

View reviewed changes

Sudha247 reviewed Mar 31, 2022

View reviewed changes

codeamic added 3 commits March 31, 2022 07:30

updates

5ec897e

update

abf4ee4

updates

2116db0

Sudha247 reviewed Apr 4, 2022

View reviewed changes

update

4fa2829

update

28ad010

update

1c310af

updated changes

0f768f6

Sudha247 reviewed Apr 11, 2022

View reviewed changes

.drone.yml Outdated Show resolved Hide resolved

.drone.yml Outdated Show resolved Hide resolved

updated lines 48 and 101

2821c7b

Sudha247 approved these changes Apr 12, 2022

View reviewed changes

Merge branch 'main' of https://github.com/ocaml-bench/sandmark into R…

013212f

…enameJsonFile "rename of json files and updated this rename in all files that it is been referenced in"

moazzammoriani mentioned this pull request Apr 19, 2022

Renaming suggestions for *run_config.json files #302

Open

Sudha247 mentioned this pull request Apr 20, 2022

Renamed the *run_config.json files #340

Closed

Deleted drone CI to be mergeable on main

543030d

	$ TAG='"macro_bench"' make run_config_filtered.json
	$ TAG='"macro_bench"' make sequential_filtered.json

		@@ -46,8 +46,8 @@ steps:
		- export OPAM_DISABLE_SANDBOXING=true
		- TAG='"run_in_ci"' make multicore_parallel_run_config_filtered.json

	- TAG='"run_in_ci"' make multicore_parallel_run_config_filtered.json
	- TAG='"run_in_ci"' make parallel_turing_filtered.json

	- TAG='"macro_bench"' make multicore_parallel_run_config_filtered_filtered.json
	- TAG='"macro_bench"' make parallel_turing_filtered_filtered.json

rename Json Files #315

Are you sure you want to change the base?

rename Json Files #315

Conversation

codeamic commented Mar 29, 2022

Sudha247 left a comment

Choose a reason for hiding this comment

codeamic commented Mar 30, 2022

codeamic left a comment

Choose a reason for hiding this comment

Sudha247 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codeamic commented Apr 3, 2022 via email

Sudha247 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codeamic commented Apr 4, 2022

shakthimaan commented Apr 5, 2022

codeamic commented Apr 5, 2022

shakthimaan commented Apr 5, 2022

codeamic commented Apr 5, 2022

codeamic commented Apr 5, 2022

shakthimaan commented Apr 6, 2022

codeamic commented Apr 7, 2022

codeamic commented Apr 7, 2022

shakthimaan commented Apr 8, 2022

codeamic commented Apr 8, 2022

shakthimaan commented Apr 8, 2022

codeamic commented Apr 8, 2022

Sudha247 left a comment

Choose a reason for hiding this comment

codeamic commented Apr 11, 2022

Sudha247 left a comment

Choose a reason for hiding this comment

codeamic commented Apr 12, 2022

Sudha247 commented Apr 12, 2022

codeamic commented Apr 12, 2022

codeamic commented Apr 12, 2022

Sudha247 commented Apr 12, 2022

codeamic commented Apr 13, 2022

shakthimaan commented Jun 21, 2022

ElectreAAS commented Jun 27, 2022 • edited Loading

ElectreAAS commented Jun 27, 2022 •

edited

Loading