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

[pytorch] Implements gammaln operator for PyTorch #3261

Closed
wants to merge 1 commit into from
Closed

[pytorch] Implements gammaln operator for PyTorch #3261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtNDArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ public PtNDArray exp() {
/** {@inheritDoc} */
@Override
public NDArray gammaln() {
throw new UnsupportedOperationException("Not implemented yet.");
return JniUtils.gammaln(this);
}

/** {@inheritDoc} */
Expand Down
5 changes: 5 additions & 0 deletions engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/JniUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,6 +1112,11 @@ public static PtNDArray exp(PtNDArray ndArray) {
ndArray.getManager(), PyTorchLibrary.LIB.torchExp(ndArray.getHandle()));
}

public static PtNDArray gammaln(PtNDArray ndArray) {
return new PtNDArray(
ndArray.getManager(), PyTorchLibrary.LIB.torchLgamma(ndArray.getHandle()));
}

public static PtNDArray log(PtNDArray ndArray) {
return new PtNDArray(
ndArray.getManager(), PyTorchLibrary.LIB.torchLog(ndArray.getHandle()));
Expand Down
2 changes: 2 additions & 0 deletions engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/PyTorchLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,8 @@ native long[] torchUnique(

native long torchExp(long handle);

native long torchLgamma(long handle);

native long torchLog(long handle);

native long torchLog10(long handle);
Expand Down
8 changes: 8 additions & 0 deletions ...torch/pytorch-native/src/main/native/ai_djl_pytorch_jni_PyTorchLibrary_torch_pointwise.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,14 @@ JNIEXPORT jlong JNICALL Java_ai_djl_pytorch_jni_PyTorchLibrary_torchExp(JNIEnv*
API_END_RETURN()
}

JNIEXPORT jlong JNICALL Java_ai_djl_pytorch_jni_PyTorchLibrary_torchLgamma(JNIEnv* env, jobject jthis, jlong jhandle) {
API_BEGIN()
const auto* tensor_ptr = reinterpret_cast<torch::Tensor*>(jhandle);
const auto* result_ptr = new torch::Tensor(tensor_ptr->lgamma());
return reinterpret_cast<uintptr_t>(result_ptr);
API_END_RETURN()
}

JNIEXPORT jlong JNICALL Java_ai_djl_pytorch_jni_PyTorchLibrary_torchLog(JNIEnv* env, jobject jthis, jlong jhandle) {
API_BEGIN()
const auto* tensor_ptr = reinterpret_cast<torch::Tensor*>(jhandle);
Expand Down
13 changes: 9 additions & 4 deletions examples/src/test/java/ai/djl/examples/training/TrainTimeSeriesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

package ai.djl.examples.training;

import ai.djl.testing.TestRequirements;
import ai.djl.engine.Engine;
import ai.djl.training.TrainingResult;
import ai.djl.translate.TranslateException;

Expand All @@ -26,10 +26,15 @@ public class TrainTimeSeriesTest {

@Test
public void testTrainTimeSeries() throws TranslateException, IOException {
TestRequirements.linux();
String[] args;
Engine engine = Engine.getEngine("PyTorch");
if (engine.getGpuCount() > 0) {
// TODO: PyTorch -- cuDNN error: CUDNN_STATUS_VERSION_MISMATCH
args = new String[] {"-g", "1", "-e", "5", "-b", "32", "--engine", "MXNet"};
} else {
args = new String[] {"-g", "1", "-e", "5", "-b", "32"};
}

// TODO: PyTorch -- cuDNN error: CUDNN_STATUS_VERSION_MISMATCH
String[] args = new String[] {"-g", "1", "-e", "5", "-b", "32", "--engine", "MXNet"};
TrainingResult result = TrainTimeSeries.runExample(args);
Assert.assertNotNull(result);
float loss = result.getTrainLoss();
Expand Down
2 changes: 1 addition & 1 deletion extensions/timeseries/src/main/java/ai/djl/timeseries/distribution/DistributionLoss.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public NDArray evaluate(NDList labels, NDList predictions) {
NDArray lossWeights = predictions.get("loss_weights");
NDArray weightedValue =
NDArrays.where(lossWeights.neq(0), loss.mul(lossWeights), loss.zerosLike());
NDArray sumWeights = lossWeights.sum().maximum(1.);
NDArray sumWeights = lossWeights.sum().maximum(1f);
loss = weightedValue.sum().div(sumWeights);
}
return loss;
Expand Down
Loading