Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maximum #17942

Merged
merged 20 commits into from
Jul 21, 2023
Merged

Maximum #17942

merged 20 commits into from
Jul 21, 2023

Conversation

Arwa45
Copy link
Contributor

@Arwa45 Arwa45 commented Jun 28, 2023

close #17840

@ivy-leaves ivy-leaves added the Paddle Frontend Developing the Paddle Frontend, checklist triggered by commenting add_frontend_checklist label Jun 28, 2023
@ivy-leaves
Copy link

If you are working on an open task, please edit the PR description to link to the issue you've created.

For more information, please check ToDo List Issues Guide.

Thank you 🤗

@Arwa45 Arwa45 closed this Jun 28, 2023
@Arwa45 Arwa45 reopened this Jun 28, 2023
@Arwa45 Arwa45 closed this Jun 28, 2023
@Arwa45 Arwa45 reopened this Jun 28, 2023
@Arwa45 Arwa45 closed this Jun 28, 2023
@Arwa45 Arwa45 reopened this Jun 28, 2023
@Arwa45 Arwa45 closed this Jun 28, 2023
@Arwa45 Arwa45 reopened this Jun 28, 2023
@HaiderSultanArc
Copy link
Contributor

@handle_frontend_method(
    class_tree=CLASS_TREE,
    init_tree="paddle.to_tensor",
    method_name="fmax",
    dtypes_and_x=helpers.dtype_and_values(
        available_dtypes=helpers.get_dtypes("float"), num_arrays=2, shared_dtype=True
    ),
)
def test_paddle_fmax(
    dtypes_and_x,
    frontend_method_data,
    init_flags,
    method_flags,
    frontend,
    on_device,
):
    input_dtype, x = dtypes_and_x
    helpers.test_frontend_method(
        init_input_dtypes=input_dtype,
        init_all_as_kwargs_np={"data": x[0]},
        method_input_dtypes=input_dtype,
        method_all_as_kwargs_np={"y": x[1]},
        frontend_method_data=frontend_method_data,
        init_flags=init_flags,
        method_flags=method_flags,
        frontend=frontend,
        on_device=on_device,
    )


@handle_frontend_method(
    class_tree=CLASS_TREE,
    init_tree="paddle.to_tensor",
    method_name="fmin",
    dtypes_and_x=helpers.dtype_and_values(
        available_dtypes=helpers.get_dtypes("float"), num_arrays=2, shared_dtype=True
    ),
)
def test_paddle_fmin(
    dtypes_and_x,
    frontend_method_data,
    init_flags,
    method_flags,
    frontend,
    on_device,
):
    input_dtype, x = dtypes_and_x
    helpers.test_frontend_method(
        init_input_dtypes=input_dtype,
        init_all_as_kwargs_np={"data": x[0]},
        method_input_dtypes=input_dtype,
        method_all_as_kwargs_np={"y": x[1]},
        frontend_method_data=frontend_method_data,
        init_flags=init_flags,
        method_flags=method_flags,
        frontend=frontend,
        on_device=on_device,
    )


@handle_frontend_method(
    class_tree=CLASS_TREE,
    init_tree="paddle.to_tensor",
    method_name="minimum",
    dtype_and_x=helpers.dtype_and_values(
        available_dtypes=helpers.get_dtypes("float"),
        num_arrays=2,
        shared_dtype=True,
    ),
)
def test_paddle_minimum(
    dtype_and_x,
    frontend_method_data,
    init_flags,
    method_flags,
    frontend,
    on_device,
):
    input_dtype, x = dtype_and_x
    helpers.test_frontend_method(
        init_input_dtypes=input_dtype,
        init_all_as_kwargs_np={"data": x[0]},
        method_input_dtypes=input_dtype,
        method_all_as_kwargs_np={"y": x[1]},
        frontend_method_data=frontend_method_data,
        init_flags=init_flags,
        method_flags=method_flags,
        frontend=frontend,
        on_device=on_device,
    )

Add this code below your test function in test file to resolve conflict.

@bipinKrishnan
Copy link
Contributor

bipinKrishnan commented Jun 29, 2023

Hey @Arwa45, can you merge your branch with ivy master. Seems like the tests you added are not picked up by the CI. Thanks 🙂

@Arwa45
Copy link
Contributor Author

Arwa45 commented Jul 2, 2023

Hey @Arwa45, can you merge your branch with ivy master. Seems like the tests you added are not picked up by the CI. Thanks 🙂

hey @bipinKrishnan Do you want to merge ivy's branch with mine?
and why CI didn't pick the tests. It's on GitHub I can see that tests ran

@bipinKrishnan
Copy link
Contributor

Hi @Arwa45 , the tests ran but it did not pick the test you added test_paddle_maximum. Thanks 🙂

@HaiderSultanArc
Copy link
Contributor

Hey @Arwa45, can you merge your branch with ivy master. Seems like the tests you added are not picked up by the CI. Thanks 🙂

Hi @bipinKrishnan , How can @Arwa45 merge her branch with Ivy's master branch. Applicants don't get that kind of access. Reviewers have to merge the branch into Ivy's master branch.

@bipinKrishnan
Copy link
Contributor

bipinKrishnan commented Jul 4, 2023

I meant to to merge ivy master onto their branch. Sorry for the confusion there 🙂 .
Also @Arwa45, please update the master in your fork with the ivy upstream branch. Not sure what happened, but resolving some merge conflicts added a lot of changes that is not related to your PR. Let's see if updating your master solves the issue, otherwise we could revert the conflict resolving commit.

Update: I've just reverted the change

@bipinKrishnan
Copy link
Contributor

Hey @Arwa45 , can you fix the failing tests for your changes. Thanks.

@bipinKrishnan
Copy link
Contributor

The tests are still failing due to some unexpected argument issue, fixing this should allow us to run the tests and see if the implementation is correct @Arwa45

@HaiderSultanArc HaiderSultanArc merged commit 5791960 into ivy-llc:master Jul 21, 2023
207 of 266 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Paddle Frontend Developing the Paddle Frontend, checklist triggered by commenting add_frontend_checklist
Projects
None yet
Development

Successfully merging this pull request may close these issues.

maximum
4 participants