Skip to content

Commit 68249a5

Browse files
Jake VanderPlasThe diffren Authors
Jake VanderPlas
authored and
The diffren Authors
committed
Remove references to deprecated submodule jax.abstract_arrays
Use jax.core instead (see jax-ml/jax#16271) PiperOrigin-RevId: 538767153
1 parent 7f1e018 commit 68249a5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+53
-54
lines changed

‎diffren/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/common/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/common/compare_images.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/common/kernels/rasterize_test_utils.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2022 The diffren Authors.
1+
/* Copyright 2023 The diffren Authors.
22
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎diffren/common/kernels/rasterize_test_utils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2022 The diffren Authors.
1+
/* Copyright 2023 The diffren Authors.
22
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎diffren/common/kernels/rasterize_triangles_impl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2022 The diffren Authors.
1+
/* Copyright 2023 The diffren Authors.
22
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎diffren/common/kernels/rasterize_triangles_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2022 The diffren Authors.
1+
/* Copyright 2023 The diffren Authors.
22
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎diffren/common/kernels/rasterize_triangles_impl_cuda.cu.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2022 The diffren Authors.
1+
/* Copyright 2023 The diffren Authors.
22
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎diffren/common/kernels/rasterize_triangles_impl_cuda.cu.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2022 The diffren Authors.
1+
/* Copyright 2023 The diffren Authors.
22
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎diffren/common/kernels/rasterize_triangles_impl_cuda_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2022 The diffren Authors.
1+
/* Copyright 2023 The diffren Authors.
22
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎diffren/common/kernels/rasterize_triangles_impl_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2022 The diffren Authors.
1+
/* Copyright 2023 The diffren Authors.
22
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎diffren/common/kernels/rasterize_triangles_types.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2022 The diffren Authors.
1+
/* Copyright 2023 The diffren Authors.
22
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎diffren/common/kernels/rasterize_utils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2022 The diffren Authors.
1+
/* Copyright 2023 The diffren Authors.
22
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎diffren/common/obj_loader.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/common/obj_loader_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/common/test_utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/camera.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/camera_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/composite.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/constants.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/internal/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/internal/framebuffer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/internal/framebuffer_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/internal/interpolate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/internal/interpolate_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/internal/kernels/descriptors.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2022 The diffren Authors.
1+
/* Copyright 2023 The diffren Authors.
22
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎diffren/jax/internal/kernels/rasterize_triangles_cpu.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2022 The diffren Authors.
1+
/* Copyright 2023 The diffren Authors.
22
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎diffren/jax/internal/kernels/rasterize_triangles_gpu.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2022 The diffren Authors.
1+
/* Copyright 2023 The diffren Authors.
22
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎diffren/jax/internal/kernels/rasterize_triangles_xla.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
2020
from . import rasterize_triangles_gpu
2121
from diffren.jax.internal.kernels import descriptors_pb2
2222
import jax
23-
from jax import abstract_arrays
2423
from jax.interpreters import batching
2524
import jax.numpy as jnp
2625
import numpy as np
@@ -150,11 +149,11 @@ def rasterize_triangles_abstract_eval(vertices, triangles, *, image_width,
150149
assert triangles.shape[1] == 3
151150
del face_culling_mode
152151

153-
return (abstract_arrays.ShapedArray((num_layers, image_height, image_width),
154-
dtype=np.int32),
155-
abstract_arrays.ShapedArray((num_layers, image_height, image_width),
156-
dtype=np.float32),
157-
abstract_arrays.ShapedArray(
152+
return (jax.core.ShapedArray((num_layers, image_height, image_width),
153+
dtype=np.int32),
154+
jax.core.ShapedArray((num_layers, image_height, image_width),
155+
dtype=np.float32),
156+
jax.core.ShapedArray(
158157
(num_layers, image_height, image_width, 3), dtype=np.float32))
159158

160159

‎diffren/jax/internal/kernels/rasterize_triangles_xla_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/internal/rasterize.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/internal/rasterize_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/internal/splat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/internal/splat_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/render.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/render_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/utils/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/utils/depthmap.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/utils/depthmap_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/utils/image.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/utils/image_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/utils/mesh.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/utils/mesh_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/utils/shaders.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/utils/shaders_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/utils/transforms.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎diffren/jax/utils/transforms_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 The diffren Authors.
1+
# Copyright 2023 The diffren Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)