Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit e62e163e authored by Daniel Lehmberg's avatar Daniel Lehmberg
Browse files

Merge remote-tracking branch 'origin/master' into hist_density_processor

parents 9aa5738f b2d5edf1
Pipeline #217633 passed with stages
in 136 minutes and 2 seconds
......@@ -28,4 +28,40 @@ Please, use following instructions to set up the OpenCL components for your oper
</details>
* [Intel Driverpack (only driver needed)](https://software.intel.com/en-us/articles/opencl-drivers#latest_linux_driver)
# Geforce RTX 2080 Ti eingebaut und installiert am 21.02.2019
``` installing rtx 1080 ti on minimuc
$ sudo apt-add-repository ppa:graphics-drivers/ppa
$ sudo apt install nvidia-utils-440
$ sudo apt install nvidia-driver-418 nvidia-settings
$ sudo reboot
#check driver
$ nvidia-smi
Fri Feb 21 13:01:51 2020
+-----------------------------------------------------------------------------+
| NVIDIA-SMI 440.59 Driver Version: 440.59 CUDA Version: 10.2 |
|-------------------------------+----------------------+----------------------+
| GPU Name Persistence-M| Bus-Id Disp.A | Volatile Uncorr. ECC |
| Fan Temp Perf Pwr:Usage/Cap| Memory-Usage | GPU-Util Compute M. |
|===============================+======================+======================|
| 0 GeForce RTX 208... Off | 00000000:3B:00.0 Off | N/A |
| 34% 36C P0 41W / 260W | 0MiB / 11019MiB | 0% Default |
+-------------------------------+----------------------+----------------------+
+-----------------------------------------------------------------------------+
| Processes: GPU Memory |
| GPU PID Type Process name Usage |
|=============================================================================|
| No running processes found |
+-----------------------------------------------------------------------------+
```
``` add symbolic link from libOpenCL.so.1 -> libOpenCL.so
cd /usr/lib/x86_64-linux-gnu/
sudo ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1 /usr/lib/x86_64-linux-gnu/libOpenCL.so
cd /etc
sudo mv ld.so.cache ld.so.cache.bak
sudo ldconfig
```
\ No newline at end of file
......@@ -18,6 +18,8 @@ import org.vadere.util.logging.Logger;
import java.awt.*;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author Benedikt Zoennchen
......@@ -78,11 +80,37 @@ public class PotentialFieldDistancesBruteForce implements IPotentialField {
if (!isInitialized){
long ms = System.currentTimeMillis();
this.cellGrid.pointStream().forEach(p -> computeDistanceToGridPoint(p));
List<Point> points = this.cellGrid.pointStream().collect(Collectors.toList());
int totalPoints = points.size();
int processedPoints = 0;
double checkpointInPercentage = 0.0;
for (Point point : points) {
checkpointInPercentage = printProgressIfCheckpointReached(processedPoints, totalPoints, checkpointInPercentage);
computeDistanceToGridPoint(point);
processedPoints++;
}
logger.info("floor field initialization time:" + (System.currentTimeMillis() - ms + "[ms]"));
}
}
private double printProgressIfCheckpointReached(int processedPoints, int totalPoints, double checkpointInPercentage) {
double newCheckpoint = checkpointInPercentage;
double progressInPercentage = ((double) processedPoints / totalPoints) * 100;
if (progressInPercentage >= checkpointInPercentage) {
logger.info(String.format("Progress: %2.0f%% -> %d/%d [points]", progressInPercentage, processedPoints, totalPoints));
double stepSize = 10.0;
newCheckpoint += stepSize;
}
return newCheckpoint;
}
private void computeDistanceToGridPoint(@NotNull final Point gridPoint) {
VPoint point = cellGrid.pointToCoord(gridPoint);
double distance = obstacles.stream().map(shape -> shape.distance(point)).min(Double::compareTo).orElse(Double.MAX_VALUE);
......
......@@ -48,7 +48,8 @@ public class VadereConfig {
private static final String DEFAULT_CONFIG_DIR = ".config";
// Both variables must not be "final" so that we are able
// to inject another config file from CLI argument "--config-file myconfig.conf".
// to inject another config file from CLI argument "--config-file myconfig.conf"
// via static method "setConfigPath()".
private static String CONFIG_FILENAME = "vadere.conf";
private static Path CONFIG_PATH = Path.of(DEFAULT_HOME_DIR, DEFAULT_CONFIG_DIR, CONFIG_FILENAME);
......@@ -208,7 +209,7 @@ public class VadereConfig {
CONFIG_FILENAME = CONFIG_PATH.getFileName().toString();
}
// Static setters
// Static getters
/**
* Use Apache Common Configuration API on the returned object to retrieve Vadere's config
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment