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.

Sign up for GitHub

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

Jump to bottom

[Fix] Fix test_triplet_margin_with_distance_loss.py #57222

Merged
merged 12 commits into from
Sep 13, 2023
Merged

[Fix] Fix test_triplet_margin_with_distance_loss.py #57222

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
477b907
tempfile_fix
shiyutang Jun 6, 2022
988c259
merge
shiyutang Jun 6, 2022
f9e93c6
update
shiyutang Jun 6, 2022
fe35300
fix_CI
shiyutang Jun 9, 2022
c83ff66
update_word2vec.inference.model
shiyutang Jun 9, 2022
1119012
remove_change_in_word2vec_book
shiyutang Jun 15, 2022
dcde43e
fix_word2vec_book
shiyutang Jun 15, 2022
7f76093
Merge branch 'PaddlePaddle:develop' into develop
shiyutang Jun 20, 2022
b407de4
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
shiyutang Sep 12, 2023
5d97994
fix_test_triplet_margin_with_distance_loss
shiyutang Sep 12, 2023
0af7cad
Merge branch 'develop' of https://github.com/shiyutang/Paddle into de…
shiyutang Sep 12, 2023
ffdeffd
update
shiyutang Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions test/legacy_test/test_triplet_margin_with_distance_loss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,10 @@ def test_dygraph(
swap=swap,
reduction=reduction,
)
dy_result = dy_res.numpy()
if reduction != 'none':
dy_result = float(dy_res)
else:
dy_result = dy_res.numpy()
paddle.enable_static()
return dy_result

Expand Down Expand Up @@ -188,9 +191,10 @@ def calc_triplet_margin_distance_loss(
return expected


class TestTripletMarginWithDistanceLoss(unittest.TestCase):
class TestTripletMarginWithDistanceLossnew(unittest.TestCase):
def test_TripletMarginDistanceLoss(self):
shape = (5, 5)
np.random.seed(1234)
input = np.random.uniform(0.1, 0.8, size=shape).astype(np.float64)
positive = np.random.uniform(0, 2, size=shape).astype(np.float64)
negative = np.random.uniform(0, 2, size=shape).astype(np.float64)
Expand Down Expand Up @@ -258,6 +262,8 @@ def test_TripletMarginDistanceLoss(self):
dy_functional, expected, rtol=1e-5, atol=1e-8
)


class TestTripletMarginWithDistanceLossError(unittest.TestCase):
def test_TripletMarginDistanceLoss_error(self):
paddle.disable_static()
self.assertRaises(
Expand All @@ -278,6 +284,8 @@ def test_TripletMarginDistanceLoss_error(self):
)
paddle.enable_static()


class TestTripletMarginWithDistanceLossDF(unittest.TestCase):
def test_TripletMarginDistanceLoss_distance_function(self):
def distance_function_1(x1, x2):
return 1.0 - paddle.nn.functional.cosine_similarity(x1, x2)
Expand All @@ -287,6 +295,7 @@ def distance_function_2(x1, x2):

distance_function_list = [distance_function_1, distance_function_2]
shape = (5, 5)
np.random.seed(1234)
input = np.random.uniform(0.1, 0.8, size=shape).astype(np.float64)
positive = np.random.uniform(0, 2, size=shape).astype(np.float64)
negative = np.random.uniform(0, 2, size=shape).astype(np.float64)
Expand Down Expand Up @@ -336,6 +345,8 @@ def distance_function_2(x1, x2):
static_functional, dy_functional, rtol=1e-5, atol=1e-8
)


class TestTripletMarginWithDistanceLossDFE(unittest.TestCase):
def test_TripletMarginWithDistanceLoss_distance_funtion_error(self):
paddle.disable_static()

Expand All @@ -344,6 +355,7 @@ def distance_function(x1, x2):

func = distance_function
shape = (5, 5)
np.random.seed(1234)
input = np.random.uniform(0.1, 0.8, size=shape).astype(np.float64)
positive = np.random.uniform(0, 2, size=shape).astype(np.float64)
negative = np.random.uniform(0, 2, size=shape).astype(np.float64)
Expand All @@ -358,6 +370,8 @@ def distance_function(x1, x2):
)
paddle.enable_static()


class TestTripletMarginWithDistanceLossDim(unittest.TestCase):
def test_TripletMarginDistanceLoss_dimension(self):
paddle.disable_static()

Expand All @@ -383,10 +397,13 @@ def test_TripletMarginDistanceLoss_dimension(self):
)
paddle.enable_static()


class TestTripletMarginWithDistanceLossSwap(unittest.TestCase):
def test_TripletMarginWithDistanceLoss_swap(self):
reduction = 'mean'
place = paddle.CPUPlace()
shape = (5, 5)
np.random.seed(1234)
input = np.random.uniform(0.1, 0.8, size=shape).astype(np.float64)
positive = np.random.uniform(0, 2, size=shape).astype(np.float64)
negative = np.random.uniform(0, 2, size=shape).astype(np.float64)
Expand Down Expand Up @@ -450,6 +467,8 @@ def test_TripletMarginWithDistanceLoss_swap(self):
dy_functional, expected, rtol=1e-5, atol=1e-8
)


class TestTripletMarginWithDistanceLossMargin(unittest.TestCase):
def test_TripletMarginWithDistanceLoss_margin(self):
paddle.disable_static()

Expand Down