Compositor tests: reorganize folders to reflect node grouping #120949

New Issue

Habib Gahbiche · 2024-04-22T20:51:49+02:00

Habib Gahbiche commented

2024-04-22 20:51:49 +02:00

Currently the folders in the test folder tests/data/compositor/ are organized as follows:

It should instead reflect the grouping used when adding a new node:

Currently the folders in the test folder `tests/data/compositor/` are organized as follows: <img src="/attachments/e91c5887-4dda-4ffb-897d-cc28148aafce" alt="folder now" width="200"/> It should instead reflect the grouping used when adding a new node: <img src="/attachments/14fcf12f-0cd0-4ece-8fe3-764dff79294f" alt="should be" width="200"/>

should be.png

37 KiB

folder now.png

65 KiB

Habib Gahbiche added the

labels 2024-04-22 20:52:01 +02:00

Habib Gahbiche added this to the Compositing project 2024-04-22 20:52:19 +02:00

Maxime-Cots commented

2024-04-23 01:13:34 +02:00

Hello, can I take this as first issue ?

I think it's a good way to improve my understanding of how source are organized

Hello, can I take this as first issue ? I think it's a good way to improve my understanding of how source are organized

YimingWu commented

2024-04-23 04:15:18 +02:00

Hi @Maxime-Cots Yes. Please take it on if you want to, and talk with developers when you have questions :D

Omar Emara commented

2024-04-23 10:02:57 +02:00

While at it, we should rename the parent folder to compositor_cpu_* and compositor_gpu_*.

While at it, we should rename the parent folder to `compositor_cpu_*` and `compositor_gpu_*`.

Maxime-Cots commented

2024-04-23 19:47:44 +02:00

While at it, we should rename the parent folder to compositor_cpu_* and compositor_gpu_*.

Did you mean rename these fixture folders

or this one and split test and fixtures between compositor_cpu and compositor_gpu ?

> While at it, we should rename the parent folder to `compositor_cpu_*` and `compositor_gpu_*`. Did you mean rename these fixture folders ![image](/attachments/dde41dda-10d3-4e21-bac0-a86ec3c8cd1d) or this one and split test and fixtures between compositor_cpu and compositor_gpu ? ![image](/attachments/d817b0ab-50f6-47bf-a8c5-abaa6c38704d)

image.png

8.1 KiB

image.png

3.9 KiB

Omar Emara commented

2024-04-23 20:05:33 +02:00

@Maxime-Cots The former, along with the actual python test files.

The reasoning is:

Make it easier to use a wildcard when executing the compositor tests. compositor_cpu instead of 'compositor_*_cpu'.
Indicate that we are testing the GPU compositor specifically, since this is not a general realtime compositor test.

@Maxime-Cots The former, along with the actual python test files. The reasoning is: - Make it easier to use a wildcard when executing the compositor tests. `compositor_cpu` instead of `'compositor_*_cpu'`. - Indicate that we are testing the GPU compositor specifically, since this is not a general realtime compositor test.

Maxime-Cots commented

2024-04-27 19:11:13 +02:00

So if I understand well, I need to :

Split compositor folder test in two separated part called respectively :

compositor_cpu
compositor_gpu

Move dedicated fixtures in corresponding folder.
Rename each subfolder to match with compositor context menu

So if I understand well, I need to : 1. Split compositor folder test in two separated part called respectively : - compositor_cpu - compositor_gpu 2. Move dedicated fixtures in corresponding folder. 3. Rename each subfolder to match with compositor context menu

Omar Emara commented

2024-04-28 08:37:47 +02:00

@Maxime-Cots I would just do it in two steps to not make confusion, so do Habib's original task for now.

👍 2

Maxime-Cots commented

2024-04-28 15:05:20 +02:00

Ok, I will do this,

I saw that test data is located in another git repository, is there any rules, guidelines, explanations about how we can commit to the data repository ?

Moreover some test file name doesn't match the its node name, as an example :

node_chroma_matte.blend -> Chroma Key

So, do you want update test file name to match node name ?

Ok, I will do this, I saw that test data is located in another git repository, is there any rules, guidelines, explanations about how we can commit to the data repository ? Moreover some test file name doesn't match the its node name, as an example : - node_chroma_matte.blend -> Chroma Key So, do you want update test file name to match node name ?

Habib Gahbiche commented

2024-04-28 15:47:36 +02:00

Generally, you should follow the pull request workflow. For working with test data, you should follow the instructions here.

Updating the file names to match the node name seems like a good idea to me :)

Generally, you should follow the [pull request workflow](https://developer.blender.org/docs/handbook/contributing/pull_requests/). For working with test data, you should follow the instructions [here](https://developer.blender.org/docs/handbook/testing/setup/#committing-test-data ). Updating the file names to match the node name seems like a good idea to me :)

Sign in to join this conversation.

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Compositor tests: reorganize folders to reflect node grouping #120949