Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
EdgeDP3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mattia Mancini
EdgeDP3
Commits
b5a80a4b
Commit
b5a80a4b
authored
1 year ago
by
Mattia Mancini
Browse files
Options
Downloads
Patches
Plain Diff
Fix linting
parent
54270fcd
Branches
Branches containing commit
No related tags found
1 merge request
!1
Update EdgeDP3 to not clush with DP3
Pipeline
#86574
failed
1 year ago
Stage: versioning
Stage: prepare
Stage: build
Stage: linting
Stage: test
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+4
-2
4 additions, 2 deletions
CMakeLists.txt
CPack/CMakeLists.txt
+4
-4
4 additions, 4 deletions
CPack/CMakeLists.txt
docs/CMakeLists.txt
+2
-1
2 additions, 1 deletion
docs/CMakeLists.txt
pythondp3/CMakeLists.txt
+2
-1
2 additions, 1 deletion
pythondp3/CMakeLists.txt
with
12 additions
and
8 deletions
CMakeLists.txt
+
4
−
2
View file @
b5a80a4b
...
@@ -662,7 +662,8 @@ target_link_libraries(edgeshowsourcedb ${SOURCEDB_LIBRARIES})
...
@@ -662,7 +662,8 @@ target_link_libraries(edgeshowsourcedb ${SOURCEDB_LIBRARIES})
add_executable
(
edgemsoverview base/msoverview.cc base/MS.cc
)
add_executable
(
edgemsoverview base/msoverview.cc base/MS.cc
)
target_link_libraries
(
edgemsoverview
${
CASACORE_LIBRARIES
}
${
Boost_LIBRARIES
}
)
target_link_libraries
(
edgemsoverview
${
CASACORE_LIBRARIES
}
${
Boost_LIBRARIES
}
)
install
(
TARGETS EDGEDP3 edgemakesourcedb edgeshowsourcedb edgemsoverview DESTINATION bin
)
install
(
TARGETS EDGEDP3 edgemakesourcedb edgeshowsourcedb edgemsoverview
DESTINATION bin
)
# Install a script that warns users that EDGEDP3 is the new name of the executable
# Install a script that warns users that EDGEDP3 is the new name of the executable
install
(
install
(
...
@@ -827,7 +828,8 @@ if(BUILD_TESTING)
...
@@ -827,7 +828,8 @@ if(BUILD_TESTING)
if
(
BUILD_WITH_CUDA
)
if
(
BUILD_WITH_CUDA
)
set_target_properties
(
unittests PROPERTIES CUDA_RESOLVE_DEVICE_SYMBOLS ON
)
set_target_properties
(
unittests PROPERTIES CUDA_RESOLVE_DEVICE_SYMBOLS ON
)
endif
()
endif
()
target_link_libraries
(
unittests LIBEDGEDP3
${
EDGEDP3_LIBRARIES
}
xtensor xtensor-blas
)
target_link_libraries
(
unittests LIBEDGEDP3
${
EDGEDP3_LIBRARIES
}
xtensor
xtensor-blas
)
# Automatically (re)build the unit tests on every ctest run.
# Automatically (re)build the unit tests on every ctest run.
add_test
(
buildunittests
${
CMAKE_COMMAND
}
--build
${
CMAKE_BINARY_DIR
}
--target
add_test
(
buildunittests
${
CMAKE_COMMAND
}
--build
${
CMAKE_BINARY_DIR
}
--target
...
...
This diff is collapsed.
Click to expand it.
CPack/CMakeLists.txt
+
4
−
4
View file @
b5a80a4b
...
@@ -25,9 +25,9 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/DetermineTargetCPU.cmake)
...
@@ -25,9 +25,9 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/DetermineTargetCPU.cmake)
# Set package name: encode target CPU, if defined, in package name.
# Set package name: encode target CPU, if defined, in package name.
if
(
DEFINED IDENTIFIED_TARGET_CPU
)
if
(
DEFINED IDENTIFIED_TARGET_CPU
)
set
(
CPACK_PACKAGE_NAME
"dp3-
${
IDENTIFIED_TARGET_CPU
}
"
)
set
(
CPACK_PACKAGE_NAME
"
edge
dp3-
${
IDENTIFIED_TARGET_CPU
}
"
)
else
()
else
()
set
(
CPACK_PACKAGE_NAME
"dp3"
)
set
(
CPACK_PACKAGE_NAME
"
edge
dp3"
)
endif
()
endif
()
set
(
CPACK_PACKAGE_VENDOR
"ASTRON"
)
set
(
CPACK_PACKAGE_VENDOR
"ASTRON"
)
...
@@ -54,14 +54,14 @@ set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
...
@@ -54,14 +54,14 @@ set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
# Determine list of conflicting package names. Packages not built for current
# Determine list of conflicting package names. Packages not built for current
# target CPU always conflict.
# target CPU always conflict.
if
(
DEFINED IDENTIFIED_TARGET_CPU
)
if
(
DEFINED IDENTIFIED_TARGET_CPU
)
set
(
_conflicts dp3
)
set
(
_conflicts
edge
dp3
)
else
()
else
()
set
(
_conflicts
)
set
(
_conflicts
)
endif
()
endif
()
foreach
(
_cpu
${
KNOWN_TARGET_CPUS
}
)
foreach
(
_cpu
${
KNOWN_TARGET_CPUS
}
)
if
(
NOT
"
${
_cpu
}
"
STREQUAL
"
${
IDENTIFIED_TARGET_CPU
}
"
)
if
(
NOT
"
${
_cpu
}
"
STREQUAL
"
${
IDENTIFIED_TARGET_CPU
}
"
)
if
(
"
${
_conflicts
}
"
STREQUAL
""
)
if
(
"
${
_conflicts
}
"
STREQUAL
""
)
set
(
_conflicts
"dp3-
${
_cpu
}
"
)
set
(
_conflicts
"
edge
dp3-
${
_cpu
}
"
)
else
()
else
()
set
(
_conflicts
"
${
_conflicts
}
, dp3-
${
_cpu
}
"
)
set
(
_conflicts
"
${
_conflicts
}
, dp3-
${
_cpu
}
"
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
docs/CMakeLists.txt
+
2
−
1
View file @
b5a80a4b
...
@@ -19,7 +19,8 @@ if(NOT EDGEDP3_VERSION)
...
@@ -19,7 +19,8 @@ if(NOT EDGEDP3_VERSION)
set
(
EDGEDP3_VERSION_PATCH
"
${
CMAKE_MATCH_3
}
"
)
set
(
EDGEDP3_VERSION_PATCH
"
${
CMAKE_MATCH_3
}
"
)
else
()
else
()
message
(
message
(
FATAL_ERROR
"Failed to parse EDGEDP3_VERSION from top level CMakeLists.txt"
)
FATAL_ERROR
"Failed to parse EDGEDP3_VERSION from top level CMakeLists.txt"
)
endif
()
endif
()
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
pythondp3/CMakeLists.txt
+
2
−
1
View file @
b5a80a4b
...
@@ -32,5 +32,6 @@ target_link_libraries(fitters PRIVATE xtensor)
...
@@ -32,5 +32,6 @@ target_link_libraries(fitters PRIVATE xtensor)
install
(
TARGETS parameterset pydp3 fitters
install
(
TARGETS parameterset pydp3 fitters
DESTINATION
"
${
PYTHON_INSTALL_DIR
}
/edgedp3"
)
DESTINATION
"
${
PYTHON_INSTALL_DIR
}
/edgedp3"
)
install
(
FILES __init__.py DESTINATION
"
${
PYTHON_INSTALL_DIR
}
/edgedp3"
)
install
(
FILES __init__.py DESTINATION
"
${
PYTHON_INSTALL_DIR
}
/edgedp3"
)
install
(
FILES steps/__init__.py DESTINATION
"
${
PYTHON_INSTALL_DIR
}
/edgedp3/steps"
)
install
(
FILES steps/__init__.py
DESTINATION
"
${
PYTHON_INSTALL_DIR
}
/edgedp3/steps"
)
install
(
FILES steps/queue.py DESTINATION
"
${
PYTHON_INSTALL_DIR
}
/edgedp3/steps"
)
install
(
FILES steps/queue.py DESTINATION
"
${
PYTHON_INSTALL_DIR
}
/edgedp3/steps"
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment